From dab12e531673507c1b449cbedf3300bbcd5c7226 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 22 Jul 2011 08:10:36 +0000 Subject: [PATCH] Small update. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@728 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/admin/main.php | 20 ++++++++++++++++++-- inc/function.php | 4 ++-- inc/versioninfo.php | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/inc/admin/main.php b/inc/admin/main.php index a24605f..5a2f940 100644 --- a/inc/admin/main.php +++ b/inc/admin/main.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: main.php - Last Update: 07/21/2011 SVN 726 - Author: cooldude2k $ + $FileInfo: main.php - Last Update: 07/22/2011 SVN 728 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="main.php"||$File3Name=="/main.php") { @@ -719,7 +719,7 @@ $skindir = dirname(realpath("settings.php"))."/".$SettDir['themes']; if ($handle = opendir($skindir)) { $dirnum = null; while (false !== ($file = readdir($handle))) { if ($dirnum==null) { $dirnum = 0; } - if (file_exists($skindir.$file."/info.php")) { + if (is_dir($skindir.$file)&&file_exists($skindir.$file."/info.php")) { if ($file != "." && $file != "..") { include($skindir.$file."/info.php"); if($Settings['DefaultTheme']==$file) { @@ -770,6 +770,18 @@ echo " value="off">off + + + + + + + + + @@ -819,6 +831,10 @@ $_POST['BoardURL'] = htmlentities($_POST['BoardURL'], ENT_QUOTES, $Settings['cha $_POST['BoardURL'] = remove_spaces($_POST['BoardURL']); $_POST['WebURL'] = htmlentities($_POST['WebURL'], ENT_QUOTES, $Settings['charset']); $_POST['WebURL'] = remove_spaces($_POST['WebURL']); +$_POST['iDBTimeFormat'] = convert_strftime($_POST['iDBTimeFormat']); +$Settings['idb_time_format'] = $_POST['iDBTimeFormat']; +$Settings['log_http_request'] = $_POST['iDBHTTPLogger']; +$Settings['log_config_format'] = $_POST['iDBLoggerFormat']; if($_POST['HTMLType']=="xhtml11") { $_POST['HTMLLevel'] = "Strict"; } if($_POST['HTMLType']=="html5") { $_POST['OutPutType'] = "html"; } if($_POST['HTMLType']=="xhtml5") { $_POST['OutPutType'] = "xhtml"; } diff --git a/inc/function.php b/inc/function.php index ce91964..c8e4035 100644 --- a/inc/function.php +++ b/inc/function.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: function.php - Last Update: 07/20/2011 SVN 723 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 07/22/2011 SVN 728 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -498,7 +498,7 @@ $strftime = str_replace("%F", "Y-m-d", $strftime); $strftime = str_replace("%x", "m/d/y", $strftime); $strftime = str_replace("%n", "\n", $strftime); $strftime = str_replace("%t", "\t", $strftime); -$logtxt = preg_replace("/\{percent\}p/s", "%", $logtxt); +$strftime = preg_replace("/\{percent\}p/s", "%", $strftime); return $strftime; } function apache_log_maker($logtxt,$logfile=null,$status=200,$contentsize="-",$headersize=0) { global $Settings; diff --git a/inc/versioninfo.php b/inc/versioninfo.php index aa03998..38120e4 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2008-2011 iDB Support - http://idb.berlios.de/ Copyright 2008-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 07/22/2011 SVN 727 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 07/22/2011 SVN 728 - 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] = 4; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 727; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 728; $SVNDay[0] = 07; $SVNDay[1] = 22; $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"; $AltGM2k = "ReneeDB Team"; -- 2.11.0