From 847eb1278443273ef2c9fcb9a3531979835060c0 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Wed, 29 Jun 2011 07:19:34 +0000 Subject: [PATCH] Another small update. :P git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@685 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/admin/sqldumper/mysql.php | 7 +++++-- inc/admin/sqldumper/pgsql.php | 7 +++++-- inc/admin/sqldumper/sqlite.php | 7 +++++-- inc/members.php | 4 ++-- inc/misc/functions.php | 10 +++++++++- inc/versioninfo.php | 23 +++++++++++++++-------- setup/sql/mysql.php | 4 ++-- setup/sql/pgsql.php | 4 ++-- setup/sql/sqlite.php | 4 ++-- sql.php | 32 +++++++++++++++++++++----------- 10 files changed, 68 insertions(+), 34 deletions(-) diff --git a/inc/admin/sqldumper/mysql.php b/inc/admin/sqldumper/mysql.php index c3fdbd9..270faba 100644 --- a/inc/admin/sqldumper/mysql.php +++ b/inc/admin/sqldumper/mysql.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: mysql.php - Last Update: 06/11/2011 SVN 666 - Author: cooldude2k $ + $FileInfo: mysql.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") { @@ -76,7 +76,10 @@ $fname .= str_replace("_","", $Settings['sqltable']).".sql.bz2"; } header("Content-Disposition: attachment; filename=".$fname); header("Content-Type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); -$SQLDumper = "SQL Dumper"; +if(!isset($AltSQLDumper)||$AltSQLDumper===null) { + $SQLDumper = "SQL Dumper"; } +if(isset($AltSQLDumper)&&$AltSQLDumper!==null) { + $SQLDumper = $AltSQLDumper; } function GetAllRows($table) { $rene_j = 0; $trowout = null; global $SQLStat; $tresult = sql_query("SELECT * FROM \"".$table."\"",$SQLStat); diff --git a/inc/admin/sqldumper/pgsql.php b/inc/admin/sqldumper/pgsql.php index 4c01eed..a17acd5 100644 --- a/inc/admin/sqldumper/pgsql.php +++ b/inc/admin/sqldumper/pgsql.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: sqlite.php - Last Update: 06/11/2011 SVN 666 - Author: cooldude2k $ + $FileInfo: sqlite.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="sqlite.php"||$File3Name=="/sqlite.php") { @@ -76,7 +76,10 @@ $fname .= str_replace("_","", $Settings['sqltable']).".sql.bz2"; } header("Content-Disposition: attachment; filename=".$fname); header("Content-Type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); -$SQLDumper = "SQL Dumper"; +if(!isset($AltSQLDumper)||$AltSQLDumper===null) { + $SQLDumper = "SQL Dumper"; } +if(isset($AltSQLDumper)&&$AltSQLDumper!==null) { + $SQLDumper = $AltSQLDumper; } function GetAllRows($table) { $rene_j = 0; $trowout = null; global $SQLStat; $tresult = sql_query("SELECT * FROM \"".$table."\"",$SQLStat); diff --git a/inc/admin/sqldumper/sqlite.php b/inc/admin/sqldumper/sqlite.php index 9044a34..0cd31be 100644 --- a/inc/admin/sqldumper/sqlite.php +++ b/inc/admin/sqldumper/sqlite.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: sqlite.php - Last Update: 06/11/2011 SVN 666 - Author: cooldude2k $ + $FileInfo: sqlite.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="sqlite.php"||$File3Name=="/sqlite.php") { @@ -76,7 +76,10 @@ $fname .= str_replace("_","", $Settings['sqltable']).".sql.bz2"; } header("Content-Disposition: attachment; filename=".$fname); header("Content-Type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); -$SQLDumper = "SQL Dumper"; +if(!isset($AltSQLDumper)||$AltSQLDumper===null) { + $SQLDumper = "SQL Dumper"; } +if(isset($AltSQLDumper)&&$AltSQLDumper!==null) { + $SQLDumper = $AltSQLDumper; } function GetAllRows($table) { $rene_j = 0; $trowout = null; global $SQLStat; $tresult = sql_query("SELECT * FROM \"".$table."\"",$SQLStat); diff --git a/inc/members.php b/inc/members.php index 749ebd2..166e49f 100644 --- a/inc/members.php +++ b/inc/members.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: members.php - Last Update: 06/14/2011 SVN 672 - Author: cooldude2k $ + $FileInfo: members.php - Last Update: 06/28/2011 SVN 685 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="members.php"||$File3Name=="/members.php") { @@ -779,7 +779,7 @@ $_SESSION['UserFormID'] = $UFID; - + diff --git a/inc/misc/functions.php b/inc/misc/functions.php index 0b0fdda..88664cf 100644 --- a/inc/misc/functions.php +++ b/inc/misc/functions.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: functions.php - Last Update: 06/14/2011 SVN 672 - Author: cooldude2k $ + $FileInfo: functions.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="functions.php"||$File3Name=="/functions.php") { @@ -31,8 +31,16 @@ if ($File3Name==$FileName||$File3Name=="/".$FileName) { CheckFile("functions.php"); require($SettDir['misc']."compression.php"); if($Settings['sqltype']=="mysql") { +if(!in_array("ini_set", $disfunc)) { +@ini_set("mysql.default_host",$Settings['sqlhost']); +@ini_set("mysql.default_user",$Settings['sqluser']); +@ini_set("mysql.default_password",$Settings['sqlpass']); } require($SettDir['sql']."mysql.php"); } if($Settings['sqltype']=="mysqli") { +if(!in_array("ini_set", $disfunc)) { +@ini_set("mysqli.default_host",$Settings['sqlhost']); +@ini_set("mysqli.default_user",$Settings['sqluser']); +@ini_set("mysqli.default_pw",$Settings['sqlpass']); } require($SettDir['sql']."mysqli.php"); } if($Settings['sqltype']=="pgsql") { require($SettDir['sql']."pgsql.php"); } diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 49e3347..58d3234 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -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/28/2011 SVN 684 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") { @@ -27,10 +27,11 @@ 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 = 684; -$SVNDay[0] = 06; $SVNDay[1] = 28; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 686; +$SVNDay[0] = 06; $SVNDay[1] = 29; $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"; +$VerCheckName = "iDB"; $AltVerCheckName = "RDB"; if(!isset($Settings['usealtname'])) { $Settings['usealtname'] = "no"; } if(isset($Settings['usealtname'])&&$Settings['usealtname']=="yes") { if(isset($iDBAltName['VER1'][0])) { $VER1[0] = $iDBAltName['VER1'][0]; } @@ -53,14 +54,15 @@ if(isset($iDBAltName['SVNDay'][0])&& $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($iDBAltName['AltFullName'])) { $AltFullName = $iDBAltName['AltFullName']; } +if(isset($iDBAltName['AltVerCheckName'])) { $AltVerCheckName = $iDBAltName['AltVerCheckName']; } } if(isset($Settings['usealtname'])&&$Settings['usealtname']=="yes") { - //$RName = $AltName; $SFName = $AltName2; $RFullName = $AltFullName; - $RName = $AltName2; $SFName = $AltName; $RFullName = $AltFullName; } + //$RName = $AltName; $SFName = $AltName2; $RFullName = $AltFullName; $VerCheckName = $AltVerCheckName; + $RName = $AltName2; $SFName = $AltName; $RFullName = $AltFullName; $VerCheckName = $AltVerCheckName; } $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_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,$VER2[2]); $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false); -$VerInfo['iDB_Full_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,true); +$VerInfo['iDB_Full_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,$VER2[2]); $VerInfo['iDB_Ver_Show'] = $VerInfo['iDB_Ver_SVN']; $VerInfo['iDB_Full_Ver_Show'] = $VerInfo['iDB_Full_Ver_SVN']; define("_iDB_Ver_", $VerInfo['iDB_Ver']); define("_iDB_Ver_SVN_", $VerInfo['iDB_Ver_SVN']); define("_iDB_Full_Ver_", $VerInfo['iDB_Full_Ver']); define("_iDB_Full_Ver_SVN_", $VerInfo['iDB_Full_Ver_SVN']); @@ -72,6 +74,11 @@ $KSPAlt = "Kazuki Suzuki Przyborowski"; */ $iDBHome = "http://idb.berlios.de/"; $DF2kHome = "http://df2k.berlios.de/"; $OrgName = "iDB"; $AltOrgName = "RDB"; $AltiDB = "Renee Discussion Boards"; +$AltSQLDumper = null; +if(isset($Settings['usealtname'])&&$Settings['usealtname']=="yes") { +if(isset($iDBAltName['AltOrgName'])) { $AltOrgName = $iDBAltName['AltOrgName']; } +if(isset($iDBAltName['AltiDB'])) { $AltiDB = $iDBAltName['AltiDB']; } +if(isset($iDBAltName['AltSQLDumperName'])) { $AltSQLDumper = $iDBAltName['AltSQLDumperName']; } } if(!isset($Settings['VerCheckURL'])|| $Settings['VerCheckURL']==="") { $VerCheckURL = $iDBHome."?act=vercheck"; } diff --git a/setup/sql/mysql.php b/setup/sql/mysql.php index fd00caa..340b971 100644 --- a/setup/sql/mysql.php +++ b/setup/sql/mysql.php @@ -12,7 +12,7 @@ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: mysql.php - Last Update: 06/11/2011 SVN 667 - Author: cooldude2k $ + $FileInfo: mysql.php - Last Update: 06/28/2011 SVN 685 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") { @@ -163,7 +163,7 @@ $query=sql_pre_query("CREATE TABLE IF NOT EXISTS \"".$_POST['tableprefix']."memb " \"Name\" varchar(150) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". " \"UserPassword\" varchar(250) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". " \"HashType\" varchar(50) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". -" \"Email\" varchar(150) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". +" \"Email\" varchar(256) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". " \"GroupID\" int(15) NOT NULL default '0',\n". " \"Validated\" varchar(20) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". " \"HiddenMember\" varchar(20) COLLATE ".$Settings['sql_collate']." NOT NULL default '',\n". diff --git a/setup/sql/pgsql.php b/setup/sql/pgsql.php index 4ad62ba..a27c2d4 100644 --- a/setup/sql/pgsql.php +++ b/setup/sql/pgsql.php @@ -12,7 +12,7 @@ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: pgsql.php - Last Update: 06/11/2011 SVN 667 - Author: cooldude2k $ + $FileInfo: pgsql.php - Last Update: 06/28/2011 SVN 685 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="pgsql.php"||$File3Name=="/pgsql.php") { @@ -140,7 +140,7 @@ $query=sql_pre_query("CREATE TABLE \"".$_POST['tableprefix']."members\" (\n". " \"Name\" varchar(150) NOT NULL default '',\n". " \"UserPassword\" varchar(250) NOT NULL default '',\n". " \"HashType\" varchar(50) NOT NULL default '',\n". -" \"Email\" varchar(150) NOT NULL default '',\n". +" \"Email\" varchar(256) NOT NULL default '',\n". " \"GroupID\" numeric(15) NOT NULL default '0',\n". " \"Validated\" varchar(20) NOT NULL default '',\n". " \"HiddenMember\" varchar(20) NOT NULL default '',\n". diff --git a/setup/sql/sqlite.php b/setup/sql/sqlite.php index 5c7e16f..f328bf8 100644 --- a/setup/sql/sqlite.php +++ b/setup/sql/sqlite.php @@ -12,7 +12,7 @@ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: sqlite.php - Last Update: 06/11/2011 SVN 667 - Author: cooldude2k $ + $FileInfo: sqlite.php - Last Update: 06/28/2011 SVN 685 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="sqlite.php"||$File3Name=="/sqlite.php") { @@ -159,7 +159,7 @@ $query=sql_pre_query("CREATE TABLE \"".$_POST['tableprefix']."members\" (\n". " \"Name\" VARCHAR(150) UNIQUE NOT NULL default '',\n". " \"UserPassword\" VARCHAR(250) NOT NULL default '',\n". " \"HashType\" VARCHAR(50) NOT NULL default '',\n". -" \"Email\" VARCHAR(150) UNIQUE NOT NULL default '',\n". +" \"Email\" VARCHAR(256) UNIQUE NOT NULL default '',\n". " \"GroupID\" INTEGER NOT NULL default '0',\n". " \"Validated\" VARCHAR(20) NOT NULL default '',\n". " \"HiddenMember\" VARCHAR(20) NOT NULL default '',\n". diff --git a/sql.php b/sql.php index 42b7e4b..9c73415 100644 --- 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/28/2011 SVN 684 - Author: cooldude2k $ + $FileInfo: sql.php - Last Update: 06/29/2011 SVN 686 - Author: cooldude2k $ */ /* Some ini setting changes uncomment if you need them. Display PHP Errors */ @@ -19,13 +19,21 @@ $disfunc = @ini_get("disable_functions"); if($disfunc!="ini_set") { $disfunc = explode(",",$disfunc); } if($disfunc=="ini_set") { $disfunc = array("ini_set"); } if(!in_array("ini_set", $disfunc)) { -// Uncomment next few lines to show errors -/*@ini_set("track_errors", true); -@ini_set("display_errors", true); -@ini_set("display_startup_errors", true); */ } +@ini_set("html_errors", false); +@ini_set("track_errors", false); +@ini_set("display_errors", false); +@ini_set("report_memleaks", false); +@ini_set("display_startup_errors", false); +//@ini_set("error_log","logs/error.log"); +@ini_set("docref_ext", ""); +@ini_set("docref_root", "http://php.net/"); } @error_reporting(E_ALL ^ E_NOTICE); /* Get rid of session id in urls */ if(!in_array("ini_set", $disfunc)) { +@ini_set("date.timezone","UTC"); +@ini_set("default_mimetype","text/html"); +@ini_set("zlib.output_compression", false); +@ini_set("zlib.output_compression_level", -1); @ini_set("session.use_trans_sid", false); @ini_set("session.use_cookies", true); @ini_set("session.use_only_cookies", true); @@ -104,7 +112,8 @@ if($Settings['charset']!="ISO-8859-15"&&$Settings['charset']!="ISO-8859-1"&& $Settings['charset']!="Shift_JIS"&&$Settings['charset']!="EUC-JP") { $Settings['charset'] = "ISO-8859-15"; } } $chkcharset = $Settings['charset']; -@ini_set('default_charset', $Settings['charset']); +if(!in_array("ini_set", $disfunc)) { +@ini_set('default_charset', $Settings['charset']); } //session_save_path($SettDir['inc']."temp/"); if(!isset($Settings['sqldb'])) { if(file_exists("install.php")) { header('Location: install.php'); die(); } @@ -189,8 +198,8 @@ if($Settings['hideverinfohttp']=="on") { $qstrtest = htmlentities($Settings['qstr'], ENT_QUOTES, $Settings['charset']); $qseptest = htmlentities($Settings['qsep'], ENT_QUOTES, $Settings['charset']); $isiteurl = $Settings['idburl']."?act".$qseptest."view"; -@ini_set("user_agent", "Mozilla/5.0 (compatible; iDB/".$iverstring."; +".$isiteurl.")"); } -$iDBVerName = "iDB|".$VER2[1]."|".$VER1[0].".".$VER1[1].".".$VER1[2]."|".$VER2[2]."|".$SubVerN; +@ini_set("user_agent", "Mozilla/5.0 (compatible; ".$VerCheckName."/".$iverstring."; +".$isiteurl.")"); } +$iDBVerName = $VerCheckName."|".$VER2[1]."|".$VER1[0].".".$VER1[1].".".$VER1[2]."|".$VER2[2]."|".$SubVerN; /* This way checks iDB version by sending the iDBVerName to the iDB Version Checker. $Settings['vercheck'] = 1; @@ -251,7 +260,7 @@ echo '<?php echo $Settings['board_name']; ?>".$iDBVerName."\n"; ?> - iDB Version Checker + Version Checker @@ -279,7 +288,8 @@ if($cookieDomain=="localhost") { $cookieDomain = false; } if($Settings['enable_https']=="on") { if($URLsTest['scheme']=="https") { $cookieSecure = true; } if($URLsTest['scheme']!="https") { $cookieSecure = false; } } } -@ini_set("default_charset",$Settings['charset']); +if(!in_array("ini_set", $disfunc)) { +@ini_set('default_charset', $Settings['charset']); } $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/"; $File2Name = $_SERVER['SCRIPT_NAME']; $File3Name=str_replace($File1Name, null, $File2Name); @@ -365,7 +375,7 @@ $Settings['sql_charset'] = $SQLCharset; } sql_set_charset($SQLCharset,$SQLStat); if($SQLStat===false) { header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($peresult); -ob_clean(); echo "Sorry could not connect to mysql database.\nContact the board admin about error. Error log below."; +ob_clean(); echo "Sorry could not connect to sql database.\nContact the board admin about error. Error log below."; echo "\n".sql_errorno($SQLStat); $urlstatus = 503; gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } $sqltable = $Settings['sqltable']; -- 2.11.0