From 6a38f2fc3f53124dae640f0da018b9f175d9683c Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Thu, 26 Jul 2007 08:22:55 +0000 Subject: [PATCH] Added settings to add session id into url. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@53 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/function.php | 7 ++++++- inc/misc/setcheck.php | 8 +++++++- inc/versioninfo.php | 6 +++--- mysql.php | 8 +++----- setup/mkconfig.php | 4 ++-- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/inc/function.php b/inc/function.php index e1a9834..6e47bd4 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: 07/24/2007 SVN 52 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 07/25/2007 SVN 53 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -139,10 +139,15 @@ function xml_doc_start($ver,$encode,$retval=false) { return xml_tag_make('xml','version='.$ver.'&encoding='.$encode,true); } } // Make a url function url_maker($file="index",$ext=".php",$qvarstr=null,$qstr=";",$qsep="=",$prexqstr=null,$exqstr=null,$fixhtml=true) { +global $sidurls; $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; +if($sidurls==true&&$qstr!="/") { + if(defined('SID')) { +if($qvarstr==null) { $qvarstr = SID; } +if($qvarstr!=null) { $qvarstr = SID."&".$qvarstr; } } } if($qvarstr==null) { $fileurl = $file; } if($fixhtml==true) { $qstr = htmlentities($qstr, ENT_QUOTES); diff --git a/inc/misc/setcheck.php b/inc/misc/setcheck.php index e05a45f..6d94ae8 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/28/2007 SVN 32 - Author: cooldude2k $ + $FileInfo: setcheck.php - Last Update: 07/25/2007 SVN 53 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="setcheck.php"||$File3Name=="/setcheck.php") { @@ -29,6 +29,12 @@ if(!isset($Settings['enable_pathinfo'])) { if($Settings['enable_pathinfo']!=true&& $Settings['enable_pathinfo']!=false) { $Settings['enable_pathinfo'] = false; } +if(!isset($Settings['sessionid_in_urls'])) { + $Settings['sessionid_in_urls'] = false; } +if($Settings['sessionid_in_urls']!=true&& + $Settings['sessionid_in_urls']!=false) { + $Settings['sessionid_in_urls'] = false; } +$sidurls = $Settings['sessionid_in_urls']; $oldusername = null; $oldtopicname = null; $ext = null; if($Settings['DefaultTheme']==null) { $Settings['DefaultTheme'] = "iDB"; } diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 236da48..e5ed245 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.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: versioninfo.php - Last Update: 07/24/2007 SVN 52 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 07/25/2007 SVN 53 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") { @@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) { return $return_var; } // Version number and date stuff. :P $VER1[0] = 0; $VER1[1] = 1; $VER1[2] = 6; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 52; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 07; $SVNDay[1] = 24; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 53; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 07; $SVNDay[1] = 25; $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/mysql.php b/mysql.php index c5b6e89..cf554e2 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: 07/23/2007 SVN 51 - Author: cooldude2k $ + $FileInfo: mysql.php - Last Update: 07/25/2007 SVN 53 - Author: cooldude2k $ */ @error_reporting(E_ALL ^ E_NOTICE); @ini_set('session.use_trans_sid', false); @@ -96,9 +96,9 @@ if($GZipEncode['Type']!="gzip") { if($GZipEncode['Type']!="deflate") { $GZipEnco @header("Date: ".gmdate("D, d M Y H:i:s")." GMT"); @header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); @header("Expires: ".gmdate("D, d M Y H:i:s")." GMT"); -if(CheckFiles("install.php")!=true) { @session_name($Settings['sqltable']."sess"); -@session_start(); } +@session_start(); +//@header("Set-Cookie: PHPSESSID=" . session_id() . "; path=".$basedir); @output_reset_rewrite_vars(); if($_GET['act']=="bsdl"||$_GET['act']=="BSDL") { $_GET['act']="bsd"; } if($_GET['act']=="bsd"||$_GET['act']=="bsd") { @@ -123,8 +123,6 @@ if($SQLStat==false) { ob_clean(); echo "Sorry could not connect to mysql database.\nContact the board admin about error. Error log berlow."; echo "\n".mysql_errno().": ".mysql_error(); gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); } -if(CheckFiles("install.php")==true) { - $Settings['board_name'] = "Installing iDB"; } if(isset($_SESSION['CheckCookie'])) { if($_SESSION['CheckCookie']!="done") { if($_COOKIE['SessPass']!=null&& diff --git a/setup/mkconfig.php b/setup/mkconfig.php index f29b313..5ecbb24 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: 07/01/2007 SVN 35 - Author: cooldude2k $ + $FileInfo: mkconfig.php - Last Update: 07/25/2007 SVN 53 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") { @@ -137,7 +137,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['sessionid_in_urls'] = false;\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