From bb84d992788d068c999d653c04dd7769ff2087a1 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 15 Jun 2007 04:26:33 +0000 Subject: [PATCH] More runtime errors fixed. (PHP Notice errors) And small update. (You can now turn off PathInfo Vars) git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@24 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/filename.php | 6 +++--- inc/function.php | 8 ++++---- inc/misc/setcheck.php | 7 ++++++- mysql.php | 6 ++++-- setup/mkconfig.php | 4 ++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/inc/filename.php b/inc/filename.php index e4b4762..b318567 100644 --- a/inc/filename.php +++ b/inc/filename.php @@ -11,7 +11,7 @@ Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ - $FileInfo: filename.php - Last Update: 06/14/2007 SVN 23 - Author: cooldude2k $ + $FileInfo: filename.php - Last Update: 06/15/2007 SVN 24 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="filename.php"||$File3Name=="/filename.php") { @@ -44,8 +44,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) { if($showsvn!=true&&$showsvn!=null) { $return_var .= " ".$showsvn." ".$svnver; } return $return_var; } $VER1[0] = 0; $VER1[1] = 1; $VER1[2] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 23; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 06; $SVNDay[1] = 14; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 24; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 06; $SVNDay[1] = 15; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false); $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true); $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false); diff --git a/inc/function.php b/inc/function.php index 622815b..c889d41 100644 --- a/inc/function.php +++ b/inc/function.php @@ -11,7 +11,7 @@ Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ - $FileInfo: function.php - Last Update: 06/14/2007 SVN 23 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 06/15/2007 SVN 24 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -73,7 +73,7 @@ $mypathinfo = str_replace($myscript, "", $myphpath); function mrstring() { $urlvar = explode('/',$_SERVER['PATH_INFO']); $num=count($urlvar); $i=1; -while ($i <= $num) { +while ($i < $num) { //$urlvar[$i] = urldecode($urlvar[$i]); if(!isset($_GET[$urlvar[$i]])) { $_GET[$urlvar[$i]] = null; } if(!isset($urlvar[$i])) { $urlvar[$i] = null; } @@ -98,8 +98,8 @@ if($type=="location") { @session_write_close(); header("Location: ".$file); } return true; } -function url_maker($file,$ext,$qvarstr=null,$qstr=";",$qsep="=",$prexqstr=null,$exqstr=null,$fixhtml=true) { -$fileurl = null; +function url_maker($file="index",$ext=".php",$qvarstr=null,$qstr=";",$qsep="=",$prexqstr=null,$exqstr=null,$fixhtml=true) { +$fileurl = null; if(!isset($ext)) { $ext = null; } if($ext==null) { $ext = ".php"; } if($ext=="noext"||$ext=="no ext"||$ext=="no+ext") { $ext = null; } $file = $file.$ext; diff --git a/inc/misc/setcheck.php b/inc/misc/setcheck.php index 0727b79..5caa957 100644 --- a/inc/misc/setcheck.php +++ b/inc/misc/setcheck.php @@ -11,7 +11,7 @@ Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ - $FileInfo: setcheck.php - Last Update: 06/14/2007 SVN 23 - Author: cooldude2k $ + $FileInfo: setcheck.php - Last Update: 06/15/2007 SVN 24 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="setcheck.php"||$File3Name=="/setcheck.php") { @@ -23,6 +23,11 @@ if(!isset($preact)) { $preact = null; } if(!isset($Settings['hash_type'])) { $Settings['hash_type'] = null; } if(!isset($Error)) { $Error = null; } if(!isset($passright)) { $passright = null; } +if(!isset($Settings['enable_pathinfo'])) { + $Settings['enable_pathinfo'] = false; } +if($Settings['enable_pathinfo']!=true&& + $Settings['enable_pathinfo']!=false) { + $Settings['enable_pathinfo'] = false; } $oldusername = null; $oldtopicname = null; $ext = null; if($Settings['DefaultTheme']==null) { $Settings['DefaultTheme'] = "iDB"; } diff --git a/mysql.php b/mysql.php index 5f18c27..4fed397 100644 --- a/mysql.php +++ b/mysql.php @@ -11,7 +11,7 @@ Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ - $FileInfo: mysql.php - Last Update: 06/06/2007 SVN 19 - Author: cooldude2k $ + $FileInfo: mysql.php - Last Update: 06/15/2007 SVN 24 - Author: cooldude2k $ */ @error_reporting(E_ALL ^ E_NOTICE); @ini_set('session.use_trans_sid', false); @@ -38,9 +38,11 @@ if(!isset($_GET['page'])) { $_GET['page'] = null; } if(!isset($_GET['act'])) { $_GET['act'] = null; } if(!isset($_POST['act'])) { $_POST['act'] = null; } if(!isset($_GET['id'])) { $_GET['id'] = null; } +$_GET['act'] = strtolower($_GET['act']); require_once($SettDir['inc'].'filename.php'); require_once($SettDir['inc'].'function.php'); -@mrstring(); // Change Path info to Get Vars :P +if($Settings['enable_pathinfo']==true) { + mrstring(); /* Change Path info to Get Vars :P */ } require_once($SettDir['misc'].'setcheck.php'); @ini_set("default_charset",$Settings['charset']); $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/"; diff --git a/setup/mkconfig.php b/setup/mkconfig.php index 8aaf83c..9358efa 100644 --- a/setup/mkconfig.php +++ b/setup/mkconfig.php @@ -12,7 +12,7 @@ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: mkconfig.php - Last Update: 06/08/2007 SVN 22 - Author: cooldude2k $ + $FileInfo: mkconfig.php - Last Update: 06/15/2007 SVN 24 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") { @@ -129,7 +129,7 @@ $CHMOD = $_SERVER['PHP_SELF']; $pretext = ""; +$BoardSettings=$pretext2[0]."\n\$Settings['sqlhost'] = '".$_POST['DatabaseHost']."';\n\$Settings['sqldb'] = '".$_POST['DatabaseName']."';\n\$Settings['sqltable'] = '".$_POST['tableprefix']."';\n\$Settings['sqluser'] = '".$_POST['DatabaseUserName']."';\n\$Settings['sqlpass'] = '".$_POST['DatabasePassword']."';\n\$Settings['board_name'] = '".$_POST['NewBoardName']."';\n\$Settings['idbdir'] = '".$idbdir."';\n\$Settings['idburl'] = '".$_POST['BoardURL']."';\n\$Settings['weburl'] = '".$_POST['WebURL']."';\n\$Settings['use_gzip'] = '".$_POST['GZip']."';\n\$Settings['html_type'] = '".$_POST['HTMLType']."';\n\$Settings['html_level'] = '".$_POST['HTMLLevel']."';\n\$Settings['output_type'] = '".$_POST['OutPutType']."';\n\$Settings['GuestGroup'] = 'Guest';\n\$Settings['MemberGroup'] = 'Member';\n\$Settings['ValidateGroup'] = 'Validate';\n\$Settings['AdminValidate'] = false;\n\$Settings['TestReferer'] = ".$_POST['TestReferer'].";\n\$Settings['DefaultTheme'] = 'iDB';\n\$Settings['DefaultTimeZone'] = '".$AdminTime."';\n\$Settings['DefaultDST'] = '".$AdminDST."';\n\$Settings['charset'] = 'iso-8859-15';\n\$Settings['add_power_by'] = false;\n\$Settings['send_pagesize'] = false;\n\$Settings['max_posts'] = '10';\n\$Settings['max_topics'] = '10';\n\$Settings['max_memlist'] = '10';\n\$Settings['hot_topic_num'] = '15';\n\$Settings['qstr'] = '&';\n\$Settings['qsep'] = '=';\n\$Settings['file_ext'] = '.php';\n\$Settings['rss_ext'] = '.php';\n\$Settings['js_ext'] = '.js';\n\$Settings['showverinfo'] = true;\n\$Settings['enable_rss'] = true;\n\$Settings['enable_search'] = true;\n\$Settings['fixpathinfo'] = false;\n\$Settings['fixbasedir'] = false;\n\$Settings['enable_pathinfo'] = false;\n\$Settings['rssurl'] = false;\n".$pretext2[1]."\n\$SettInfo['board_name'] = '".$_POST['NewBoardName']."';\n\$SettInfo['Author'] = '".$_POST['AdminUser']."';\n\$SettInfo['Keywords'] = '".$_POST['NewBoardName'].",".$_POST['AdminUser']."';\n\$SettInfo['Description'] = '".$_POST['NewBoardName'].",".$_POST['AdminUser']."';\n".$pretext2[2]."\n\$SettDir['maindir'] = '".$idbdir."';\n\$SettDir['inc'] = 'inc/';\n\$SettDir['misc'] = 'inc/misc/';\n\$SettDir['admin'] = 'inc/admin/';\n\$SettDir['mod'] = 'inc/mod/';\n\$SettDir['themes'] = 'themes/';\n".$pretext2[3]."\n?>"; $BoardSettingsBak = $pretext.$settcheck.$BoardSettings; $BoardSettings = $pretext.$settcheck.$BoardSettings; $fp = fopen("settings.php","w+"); -- 2.11.0