From a3e242a6bf9a67207d9e6116886cda27e2803963 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Thu, 28 Jan 2010 05:42:55 +0000 Subject: [PATCH] Small update. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@454 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- admin.php | 14 +++++++++----- inc/admin/main.php | 11 +++++------ inc/versioninfo.php | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/admin.php b/admin.php index 43e5ed4..9c508b3 100644 --- a/admin.php +++ b/admin.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: admin.php - Last Update: 12/19/2009 SVN 429 - Author: cooldude2k $ + $FileInfo: admin.php - Last Update: 01/27/2010 SVN 454 - Author: cooldude2k $ */ if(ini_get("register_globals")) { require_once('inc/misc/killglobals.php'); } @@ -49,9 +49,13 @@ if($_GET['act']=="vercheck"&&$GroupInfo['ViewDBInfo']=="yes") { if($Settings['vercheck']!=1&&$Settings['vercheck']!=2) { $Settings['vercheck'] = 1; } if($Settings['vercheck']===1) { - header("Location: ".$VerCheckURL."&name=".urlencode($iDBVerName)); } + $addredirect = null; + if(isset($_GET['redirect'])) { $addredirect = "&redirect=".urlencode($_GET['redirect']); } + header("Location: ".$VerCheckURL."&name=".urlencode($iDBVerName).$addredirect); } if($Settings['vercheck']===2) { - header("Location: ".$VerCheckURL."&bid=".$Settings['bid']."&vercheck=newtype"); } } + $addredirect = null; + if(isset($_GET['redirect'])) { $addredirect = "&redirect=".urlencode($_GET['redirect']); } + header("Location: ".$VerCheckURL."&bid=".$Settings['bid']."&vercheck=newtype".$addredirect); } } if($_GET['act']=="view") { $AdminMenu = "menu"; if($_GET['menu']==null) { diff --git a/inc/admin/main.php b/inc/admin/main.php index 5b901f2..f8934f4 100644 --- a/inc/admin/main.php +++ b/inc/admin/main.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: main.php - Last Update: 01/26/2010 SVN 451 - Author: cooldude2k $ + $FileInfo: main.php - Last Update: 01/27/2010 SVN 454 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="main.php"||$File3Name=="/main.php") { @@ -239,10 +239,9 @@ $MGroups[$mi]=sql_result($mgresults,$mi,"Name"); ++$mi; } sql_free_result($mgresults); if($Settings['vercheck']===1) { -$AdminCheckURL = $VerCheckURL."&name=".urlencode($iDBVerName)."&redirect=on"; } +$AdminCheckURL = url_maker($exfile['admin'],$Settings['file_ext'],"act=vercheck&redirect=on",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); } if($Settings['vercheck']===2) { -$Settings['bid'] = base64_encode(urlencode($Settings['idburl'])); -$AdminCheckURL = $VerCheckURL."&bid=".$Settings['bid']."&vercheck=newtype&redirect=on"; } +$AdminCheckURL = url_maker($exfile['admin'],$Settings['file_ext'],"act=vercheck&vercheck=newtype&redirect=on",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); } ?>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 8aeb936..7c39033 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 01/27/2010 SVN 453 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 01/27/2010 SVN 454 - 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] = 3; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 453; $RName = "iDB"; $SFName = "IntDB"; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 454; $RName = "iDB"; $SFName = "IntDB"; $SVNDay[0] = 01; $SVNDay[1] = 27; $SVNDay[2] = 2010; $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); -- 2.11.0