OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8fe9b66)
Small updates and bug fixes.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Thu, 20 Aug 2015 02:39:23 +0000 (21:39 -0500)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Thu, 20 Aug 2015 02:39:23 +0000 (21:39 -0500)
inc/admin/main.php patch | blob | history
inc/function.php patch | blob | history
inc/html5.php patch | blob | history
inc/versioninfo.php patch | blob | history
setup/mkconfig.php patch | blob | history
setup/setup.php patch | blob | history

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 8a41378..5eb7de8 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 08/19/2015 SVN 801 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -593,10 +593,10 @@ $usertzstarttime->setTimezone($usertz);
        <td style="width: 50%;"><?php echo $usertzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
 </tr><tr>
        <td style="width: 50%;"><span class="TextBoxLabel" title="Using Board Time Zone">[Board TimeZone] Install Date:</span></td>
-       <td style="width: 50%;"><?php echo $deftzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
+       <td style="width: 50%;"><?php echo $servtzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
 </tr><tr>
        <td style="width: 50%;"><span class="TextBoxLabel" title="Using Server Time Zone">[Server TimeZone] Install Date:</span></td>
-       <td style="width: 50%;"><?php echo $servtzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
+       <td style="width: 50%;"><?php echo $deftzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
 </tr><tr>
        <td style="width: 50%;"><span class="TextBoxLabel" title="Using UTC Time Zone">[UTC TimeZone] Install Date:</span></td>
        <td style="width: 50%;"><?php echo $utctzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
@@ -780,12 +780,6 @@ while ($gi < $gnum) { ?>
        <option<?php if($Settings['html_type']=="xhtml5") { echo " selected=\"selected\""; } ?> value="xhtml5">XHTML 5</option>
        </select></td>
 </tr><tr style="text-align: left;">
-       <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLLevel">HTML Level only for XHTML 1.0:</label></td>
-       <td style="width: 50%;"><select size="1" class="TextBox" name="HTMLLevel" id="HTMLLevel">
-       <option<?php if($Settings['html_level']=="Transitional") { echo " selected=\"selected\""; } ?> value="Transitional">Transitional</option>
-       <option<?php if($Settings['html_level']=="Strict") { echo " selected=\"selected\""; } ?> value="Strict">Strict</option>
-       </select></td>
-</tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="OutPutType">Output file as:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="OutPutType" id="OutPutType">
        <option<?php if($Settings['output_type']=="html") { echo " selected=\"selected\""; } ?> value="html">HTML</option>
@@ -1013,7 +1007,6 @@ $Settings['idb_time_format'] = $_POST['iDBTimeFormat'];
 $Settings['idb_date_format'] = $_POST['iDBDateFormat'];
 $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"; }
 if(!isset($_POST['PassHashType'])) {
@@ -1053,7 +1046,6 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['SQLThemes'] = ".null_string($Settings['SQLThemes']).";\n".
 "\$Settings['use_gzip'] = ".null_string($_POST['UseGzip']).";\n".
 "\$Settings['html_type'] = ".null_string($_POST['HTMLType']).";\n".
-"\$Settings['html_level'] = ".null_string($_POST['HTMLLevel']).";\n".
 "\$Settings['output_type'] = ".null_string($_POST['OutPutType']).";\n".
 "\$Settings['GuestGroup'] = ".null_string($_POST['GuestGroup']).";\n".
 "\$Settings['MemberGroup'] = ".null_string($_POST['MemberGroup']).";\n".
diff --git a/inc/function.php b/inc/function.php
index ad9516a..60c0c73 100644 (file)
--- a/inc/function.php
+++ b/inc/function.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: function.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: function.php - Last Update: 08/19/2015 SVN 801 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="function.php"||$File3Name=="/function.php") {
@@ -537,6 +537,12 @@ $strftime = preg_replace("/\{percent\}p/s", "%", $strftime);
 return $strftime; }
 function apache_log_maker($logtxt,$logfile=null,$status=200,$contentsize="-",$headersize=0) {
 global $Settings;
+if(isset($Settings['DefaultTimeZone'])) {
+$servtz = new DateTimeZone($Settings['DefaultTimeZone']); }
+if(!isset($Settings['DefaultTimeZone'])) {
+$servtz = new DateTimeZone(date_default_timezone_get()); }
+$servcurtime = new DateTime();
+$servcurtime->setTimezone($servtz);
 if(!isset($_SERVER['HTTP_REFERER'])) { $LOG_URL_REFERER = "-"; }
 if(isset($_SERVER['HTTP_REFERER'])) { $LOG_URL_REFERER = $_SERVER['HTTP_REFERER']; }
 if($LOG_URL_REFERER==""||$LOG_URL_REFERER==null) { $LOG_URL_REFERER = "-"; }
@@ -620,7 +626,7 @@ $logtxt = preg_replace("/%([\<\>]*?)p/s", $_SERVER["SERVER_PORT"], $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)q/s", $LOG_QUERY_STRING, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)r/s", $HTTP_REQUEST_LINE, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)s/s", $status, $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)t/s", "[".date("d/M/Y:H:i:s O")."]", $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)t/s", "[".$servcurtime->format("d/M/Y:H:i:s O")."]", $logtxt);
 $logtxt = preg_replace_callback("/%([\<\>]*?)\{([^\}]*)\}t/s", "get_time", $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)u/s", $LOG_AUTH_USER, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)U/s", log_fix_quotes($_SERVER["PHP_SELF"]), $logtxt);
@@ -649,13 +655,19 @@ if(isset($logfile)&&$logfile!==null) {
 return $logtxt; }
 function idb_log_maker($status=200,$contentsize="-") {
 global $Settings,$SettDir;
+if(isset($Settings['DefaultTimeZone'])) {
+$servtz = new DateTimeZone($Settings['DefaultTimeZone']); }
+if(!isset($Settings['DefaultTimeZone'])) {
+$servtz = new DateTimeZone(date_default_timezone_get()); }
+$servcurtime = new DateTime();
+$servcurtime->setTimezone($servtz);
 if(!isset($Settings['log_http_request'])) {
        $Settings['log_http_request'] = "off"; }
 if(!isset($Settings['log_config_format'])) {
        $Settings['log_config_format'] = "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""; }
 if(isset($Settings['log_http_request'])&&$Settings['log_http_request']=="on"&&
        $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") {
-return apache_log_maker($Settings['log_config_format'], $SettDir['logs'].$Settings['sqltable'].date("YW").".log", $status, $contentsize, strlen(implode("\r\n",headers_list())."\r\n\r\n")); }
+return apache_log_maker($Settings['log_config_format'], $SettDir['logs'].$Settings['sqltable'].$servcurtime->format("Ym").".log", $status, $contentsize, strlen(implode("\r\n",headers_list())."\r\n\r\n")); }
 if(isset($Settings['log_http_request'])&&$Settings['log_http_request']!="on"&&
        $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") {
 $Settings['log_http_request'] = preg_replace_callback("/".preg_quote("%{", "/")."([^\}]*)".preg_quote("}t", "/")."/s", "get_time", $Settings['log_http_request']);
diff --git a/inc/html5.php b/inc/html5.php
index d1175f8..0233591 100644 (file)
--- a/inc/html5.php
+++ b/inc/html5.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: html5.php - Last Update: 08/18/2015 SVN 798 - Author: cooldude2k $
+    $FileInfo: html5.php - Last Update: 08/19/2015 SVN 801 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="xhtml10.php"||$File3Name=="/xhtml10.php") {
@@ -95,8 +95,7 @@ if($Settings['html_level']!="Strict") {
                $Settings['html_level'] = "Transitional"; } }
 // HTML Document Starts
 ob_start("idb_suboutput_handler");
-if($XHTML5===false) {
-?>
+if($XHTML5===false) { ?>
 <!DOCTYPE html>
 <?php // HTML meta tags and other html, head tags ?>
 <html lang="en">
@@ -202,7 +201,7 @@ ob_start("idb_suboutput_handler"); ?>
 <meta name="Generator" content="<?php echo $VerInfo['iDB_Ver_Show']; ?>" />
 <?php } if($Settings['showverinfo']!="on") { ?>
 <meta name="Generator" content="<?php echo $iDB; ?>" />
-<?php } echo "\n"; ?>
+<?php } ?>
 <meta name="Author" content="<?php echo $SettInfo['Author']; ?>" />
 <meta name="Keywords" content="<?php echo $SettInfo['Keywords']; ?>" />
 <meta name="Description" content="<?php echo $SettInfo['Description']; ?>" />
@@ -212,11 +211,15 @@ ob_start("idb_suboutput_handler"); ?>
 <!-- generator="<?php echo $VerInfo['iDB_Ver_Show']; ?>" -->
 <?php } if($Settings['showverinfo']!="on") { ?>
 <!-- generator="<?php echo $iDB; ?>" -->
-<?php } echo "\n"; $iWrappers['METATAGS'] = ob_get_clean(); 
+<?php } $iWrappers['METATAGS'] = ob_get_clean(); 
 ob_start("idb_suboutput_handler"); ?>
-
 <script type="text/javascript" src="<?php echo url_maker($exfilejs['javascript'],$Settings['js_ext'],null,$Settings['qstr'],$Settings['qsep'],$prexqstrjs['javascript'],$exqstrjs['javascript']); ?>"></script>
-<?php echo "\n";
+<?php echo "\n"; $iWrappers['JAVASCRIPT'] = ob_get_clean(); 
+ob_start("idb_suboutput_handler"); ?>
+<link rel="Start" href="<?php echo $AltBoardURL.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" title="<?php echo $Settings['board_name'].$idbpowertitle; ?>" />
+<link rel="Copyright" href="<?php echo $AltBoardURL.url_maker($exfile['index'],$Settings['file_ext'],"act=bsd",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" title="Copyright Notice" />
+<?php echo "\n"; $iWrappers['LINKTAGS'] = ob_get_clean(); 
+ob_start("idb_suboutput_handler");
 if($ThemeSet['CSSType']=="import") { ?>
 <style type="text/css">
 /* Import the theme css file */
@@ -257,5 +260,4 @@ ob_start("idb_suboutput_handler");
 if($ThemeSet['FavIcon']!=null) { ?>
 <link rel="icon" href="<?php echo $ThemeSet['FavIcon']; ?>" />
 <link rel="shortcut icon" href="<?php echo $ThemeSet['FavIcon']; ?>" />
-<?php }
-$iWrappers['FAVICON'] = ob_get_clean(); ?>
\ No newline at end of file
+<?php } $iWrappers['FAVICON'] = ob_get_clean(); ?>
\ No newline at end of file
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 12db850..0b3c63d 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 08/19/2015 SVN 800 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 08/19/2015 SVN 801 - 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] = 8; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 800;
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 801;
 $SVNDay[0] = 8; $SVNDay[1] = 19; $SVNDay[2] = 2015; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "DF2k"; $AltName2 = "DF2k"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Discussion Forums 2k"; $AltGM2k = "DF2k Team";
diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index b0da756..e6d94f1 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 08/19/2015 SVN 801 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -92,7 +92,6 @@ if (pre_strlen($_POST['AdminUser'])>"30") { $Error="Yes";
 echo "<br />Your user name is too big."; }
 if ($_POST['AdminPasswords']!=$_POST['ReaPassword']) { $Error="Yes";
 echo "<br />Your passwords did not match."; }
-if($_POST['HTMLType']=="xhtml11") { $_POST['HTMLLevel'] = "Strict"; }
 if($_POST['HTMLType']=="html5") { $_POST['OutPutType'] = "html"; }
 if($_POST['HTMLType']=="xhtml5") { $_POST['OutPutType'] = "xhtml"; }
 $_POST['BoardURL'] = htmlentities($_POST['BoardURL'], ENT_QUOTES, $Settings['charset']);
@@ -329,7 +328,6 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['SQLThemes'] = '".$_POST['SQLThemes']."';\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".
@@ -429,7 +427,7 @@ if(!@unlink($SetupDir['setup'].'mkconfig.php')) { $chdel = false; }
 if(!@unlink($SetupDir['setup'].'preinstall.php')) { $chdel = false; }
 if(!@unlink($SetupDir['setup'].'presetup.php')) { $chdel = false; }
 if(!@unlink($SetupDir['setup'].'setup.php')) { $chdel = false; }
-if(!@unlink($SetupDir['setup'].'xhtml10.php')) { $chdel = false; }
+if(!@unlink($SetupDir['setup'].'html5.php')) { $chdel = false; }
 if(!@rmdir('setup')) { $chdel = false; }
 if(!@unlink('install.php')) { $chdel = false; } } }
 ?><span class="TableMessage">
diff --git a/setup/setup.php b/setup/setup.php
index 65a9400..eab6202 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 08/19/2015 SVN 801 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -206,12 +206,6 @@ for ($i=0; $i < count($timezone_identifiers); $i++) {
        <option value="xhtml5">XHTML 5</option>
        </select></td>
 </tr><tr>
-       <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLLevel">HTML Level only for XHTML 1.0:</label></td>
-       <td style="width: 50%;"><select size="1" class="TextBox" name="HTMLLevel" id="HTMLLevel">
-       <option value="Transitional">Transitional</option>
-       <option value="Strict">Strict</option>
-       </select></td>
-</tr><tr>
        <td style="width: 50%;"><label class="TextBoxLabel" for="OutPutType">Output file as:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="OutPutType" id="OutPutType">
        <option value="html">HTML</option>
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help