Small bug fix and made html5 the only option.

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 8b98474..8a41378 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -375,6 +375,8 @@ if(isset($OptimizeAr["Msg_text"])) { unset($OptimizeAr["Msg_text"]); }
 if(isset($OptimizeAr[3])) { unset($OptimizeAr[3]); }
 if($Settings['sqltype']=="mysql"||
        $Settings['sqltype']=="mysqli") {
+if(isset($_GET['subact']) && $_GET['subact']=="repair") {
+       $RepairTea = sql_query(sql_pre_query("REPAIR TABLE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); }
 $OptimizeTea = sql_query(sql_pre_query("OPTIMIZE TABLE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); }
 if($Settings['sqltype']=="cubrid") {
 $OptimizeTea = sql_query(sql_pre_query("UPDATE STATISTICS ON \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); }
@@ -588,11 +590,17 @@ $usertzstarttime->setTimezone($usertz);
 <table style="text-align: left;">
 <tr>
        <td style="width: 50%;"><span class="TextBoxLabel" title="Using User Time Zone">[User TimeZone] Install Date:</span></td>
-       <td style="width: 50%;"><?php echo $usertzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']); ?></td>
-</tr><?php if($_SESSION['UserTimeZone']!=$Settings['DefaultTimeZone']) { ?><tr>
+       <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']); ?></td>
-</tr><?php } if($GroupInfo['ViewDBInfo']=="yes") { 
+       <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 Server Time Zone">[Server TimeZone] Install Date:</span></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 UTC Time Zone">[UTC TimeZone] Install Date:</span></td>
+       <td style="width: 50%;"><?php echo $utctzstarttime->format($_SESSION['iDBDateFormat'].", ".$_SESSION['iDBTimeFormat']." P"); ?></td>
+</tr><?php if($GroupInfo['ViewDBInfo']=="yes") { 
 ?><tr style="text-align: left;">
        <td style="width: 50%;"><span class="TextBoxLabel">Forum Software Version:</span></td>
        <td style="width: 50%;"><?php echo "<span title=\"".$VerInfo['iDB_Full_Ver_Show']."\">".$VerInfo['iDB_Ver_Show']."</span>"; ?><!--&nbsp;<a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=vercheck",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>" onclick="window.open(this.href);return false;"><img src="<?php echo $AdminCheckURL; ?>" alt="Version Check: Click to see more info." title="Version Check: Click to see more info." /></a>--></td>
@@ -766,8 +774,8 @@ while ($gi < $gnum) { ?>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLType">HTML Type to use:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="HTMLType" id="HTMLType">
-       <option<?php if($Settings['html_type']=="xhtml10") { echo " selected=\"selected\""; } ?> value="xhtml10">XHTML 1.0</option>
-       <option<?php if($Settings['html_type']=="xhtml11") { echo " selected=\"selected\""; } ?> value="xhtml11">XHTML 1.1</option>
+       <!--<option<?php if($Settings['html_type']=="xhtml10") { echo " selected=\"selected\""; } ?> value="xhtml10">XHTML 1.0</option>-->
+       <!--<option<?php if($Settings['html_type']=="xhtml11") { echo " selected=\"selected\""; } ?> value="xhtml11">XHTML 1.1</option>-->
        <option<?php if($Settings['html_type']=="html5") { echo " selected=\"selected\""; } ?> value="html5">HTML 5</option>
        <option<?php if($Settings['html_type']=="xhtml5") { echo " selected=\"selected\""; } ?> value="xhtml5">XHTML 5</option>
        </select></td>

diff --git a/inc/misc/setcheck.php b/inc/misc/setcheck.php
index 02f9fd6..5a9b38f 100644 (file)
--- a/inc/misc/setcheck.php
+++ b/inc/misc/setcheck.php
@@ -165,7 +165,7 @@ if($Settings['ValidateGroup']==null&&
        $Settings['AdminValidate']=="on") {
 $Settings['ValidateGroup'] = "Validate"; }
 if($Settings['html_type']=="html4") { 
-       $Settings['html_type'] = "html10"; }
+       $Settings['html_type'] = "html5"; }
 /*if($_GET['debug']!="off"||$_GET['debug']=="on") {
        output_add_rewrite_var("amp;debug",$_GET['debug']); }*/
 if (!isset($_GET['action'])) { $_GET['action'] = null; }

diff --git a/inc/stats.php b/inc/stats.php
index abb6e65..7cc2d42 100644 (file)
--- a/inc/stats.php
+++ b/inc/stats.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: stats.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: stats.php - Last Update: 08/19/2015 SVN 799 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="stats.php"||$File3Name=="/stats.php") {
@@ -207,7 +207,7 @@ $tdMembersOnline .= " (<a title=\"".$tdMemList['IP']."\" onclick=\"window.open(t
 <?php echo $bdstring; ?>
 </div></td>
 </tr>
-<tr id="Stats4" class="TableStatsRow2">
+<tr id="Stats5" class="TableStatsRow2">
 <td class="TableStatsColumn2" colspan="2" style="width: 100%; font-weight: bold;">Board Stats</td>
 </tr>
 <tr class="TableStatsRow3" id="Stats6">
@@ -220,10 +220,10 @@ $tdMembersOnline .= " (<a title=\"".$tdMemList['IP']."\" onclick=\"window.open(t
 &nbsp;Our newest member is <a<?php echo $NewestMemTitle; ?> href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$NewestMem['ID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $NewestMem['Name']; ?></a><?php echo $NewestMemExtraIP; ?>
 </div></td>
 </tr>
-<tr id="Stats5" class="TableStatsRow2">
+<tr id="Stats7" class="TableStatsRow2">
 <td class="TableStatsColumn2" colspan="2" style="width: 100%; font-weight: bold;">Members Online Today: <?php echo $tdNumberMembers; ?></td>
 </tr>
-<tr class="TableStatsRow3" id="Stats6">
+<tr class="TableStatsRow3" id="Stats8">
 <td style="width: 4%;" class="TableStatsColumn3"><div class="statsicon">
 <?php echo $ThemeSet['StatsIcon']; ?></div></td>
 <td style="width: 96%;" class="TableStatsColumn3"><div class="statsinfo">
@@ -232,7 +232,7 @@ $tdMembersOnline .= " (<a title=\"".$tdMemList['IP']."\" onclick=\"window.open(t
 &nbsp;<?php echo $tdMembersOnline; ?>
 </div></td>
 </tr>
-<tr id="Stats6" class="TableStatsRow4">
+<tr id="Stats9" class="TableStatsRow4">
 <td class="TableStatsColumn4" colspan="2">&nbsp;</td>
 </tr>
 </table></div>

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index d64acea..fc6ed40 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/18/2015 SVN 798 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 08/19/2015 SVN 799 - 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] = 4; $VER1[2] = 8; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 798;
-$SVNDay[0] = 8; $SVNDay[1] = 18; $SVNDay[2] = 2015; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 799;
+$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";
 $VerCheckName = "iDB"; $AltVerCheckName = "DF2k"; $AltiDBHome = "http://df2k.gamemaker2k.org/";

diff --git a/inc/xhtml10.php b/inc/xhtml10.php
deleted file mode 100644 (file)
index 6f2a9a5..0000000
--- a/inc/xhtml10.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Revised BSD License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Revised BSD License for more details.
-
-    Copyright 2004-2015 iDB Support - http://idb.berlios.de/
-    Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
-
-    $FileInfo: xhtml10.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
-*/
-$File3Name = basename($_SERVER['SCRIPT_NAME']);
-if ($File3Name=="xhtml10.php"||$File3Name=="/xhtml10.php") {
-       require('index.php');
-       exit(); }
-ob_start("idb_suboutput_handler");
-// Check to see if we serv the file as html or xhtml
-// if we do xhtml we also check to see if user's browser 
-// can dispay if or else fallback to html
-if($Settings['output_type']=="html") {
-       $ccstart = "//<!--"; $ccend = "//-->";
-header("Content-Type: text/html; charset=".$Settings['charset']); }
-if($Settings['output_type']=="xhtml") {
-if(stristr($_SERVER["HTTP_ACCEPT"],"application/xhtml+xml")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-       header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']); }
-else { if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-   header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']);
-} else { $ccstart = "//<!--"; $ccend = "//-->";
-       header("Content-Type: text/html; charset=".$Settings['charset']); } } }
-if($Settings['output_type']!="xhtml") {
-       if($Settings['output_type']!="html") {
-               $ccstart = "//<!--"; $ccend = "//-->";
-header("Content-Type: text/html; charset=".$Settings['charset']); } }
-if($checklowview===true&&$_GET['act']=="lowview") { 
-   $ThemeSet['CSSType'] = "lowview"; 
-   $ThemeSet['ThemeName'] = $OrgName." Low Theme";
-   $ThemeSet['ThemeMaker'] =$iDB_Author;
-   $ThemeSet['ThemeVersion'] = $VER1[0].".".$VER1[1].".".$VER1[2];
-   $ThemeSet['ThemeVersionType'] = $VER2[0];
-   $ThemeSet['ThemeSubVersion'] = $VER2[2]." ".$SubVerN;
-   $ThemeSet['MakerURL'] = $iDBHome."support/?act=lowview";
-   $ThemeSet['CopyRight'] = $ThemeSet['ThemeName']." was made by <a href=\"".$ThemeSet['MakerURL']."\" title=\"".$ThemeSet['ThemeMaker']."\">".$ThemeSet['ThemeMaker']."</a>";
-   $ThemeInfo['ThemeName'] = $ThemeSet['ThemeName'];
-   $ThemeInfo['ThemeMaker'] = $ThemeSet['ThemeMaker'];
-   $ThemeInfo['ThemeVersion'] = $ThemeSet['ThemeVersion'];
-   $ThemeInfo['ThemeVersionType'] = $ThemeSet['ThemeVersionType'];
-   $ThemeInfo['ThemeSubVersion'] = $ThemeSet['ThemeSubVersion'];
-   $ThemeInfo['MakerURL'] = $ThemeSet['MakerURL'];
-   $ThemeInfo['CopyRight'] = $ThemeSet['CopyRight']; }
-if($ThemeSet['CSSType']!="import"&&
-   $ThemeSet['CSSType']!="link"&&
-   $ThemeSet['CSSType']!="lowview"&&
-   $ThemeSet['CSSType']!="xml"&&
-   $ThemeSet['CSSType']!="sql") { 
-   $ThemeSet['CSSType'] = "import"; }
-if($ThemeSet['CSSType']=="xhtml") {
-   xml_tag_make("xml-stylesheet","type=text/css&href=".$ThemeSet['CSS']); }
-header("Content-Style-Type: text/css");
-header("Content-Script-Type: text/javascript");
-if($Settings['showverinfo']!="on") {
-$iDBURL1 = "<a href=\"".$iDBHome."\" title=\"".$iDB."\" onclick=\"window.open(this.href);return false;\">"; }
-if($Settings['showverinfo']=="on") {
-$iDBURL1 = "<a href=\"".$iDBHome."\" title=\"".$VerInfo['iDB_Ver_Show']."\" onclick=\"window.open(this.href);return false;\">"; }
-$GM2kURL = "<a href=\"".$GM2kHome."\" title=\"".$GM2k."\" onclick=\"window.open(this.href);return false;\">".$GM2k."</a>";
-$csryear = "2004"; $cryear = date("Y"); if($cryear<=2004) { $cryear = "2005"; }
-$BSDL = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=bsd",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\" title=\"".$RName." is dual-licensed under the Revised BSD License\">BSDL</a>";
-$GPL = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=bsd",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\" title=\"".$RName." is dual-licensed under the Gnu General Public License\">GPL</a>";
-$DualLicense = $BSDL." &amp; ".$GPL;
-$extext = null;
-if($checklowview!==true) { $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">Low-Version</a>"; }
-if($checklowview===true&&$_GET['act']!="lowview") { $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">Low-Version</a>"; }
-if($checklowview===true&&$_GET['act']=="lowview") {  $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">High-Version</a>"; }
-$endpagevar = "<div class=\"copyright\">Powered by ".$iDBURL1.$RName."</a> &copy; ".$GM2kURL." @ ".$csryear." - ".$cryear." <br />\n".$ThemeSet['CopyRight']." | ".$extext; 
-header("Content-Language: en");
-header("Vary: Accept-Encoding");
-// Check if we are on a secure HTTP connection
-if($_SERVER['HTTPS']=="on") { $prehost = "https://"; }
-if($_SERVER['HTTPS']!="on") { $prehost = "http://"; }
-// Get the board's url
-if($Settings['idburl']=="localhost"||$Settings['idburl']==null) {
-       $BoardURL = $prehost.$_SERVER["HTTP_HOST"].$basedir; }
-if($Settings['idburl']!="localhost"&&$Settings['idburl']!=null) {
-       $BoardURL = $Settings['idburl']; 
-       if($Settings['qstr']!="/") {
-       $AltBoardURL = $BoardURL; } 
-       if($Settings['qstr']=="/") { 
-       $AltBoardURL = preg_replace("/\/$/","",$BoardURL); } }
-// Get the html level
-if($Settings['html_level']!="Strict") {
-       if($Settings['html_level']!="Transitional") {
-               $Settings['html_level'] = "Transitional"; } }
-// HTML Document Starts
-if($Settings['html_level']=="Strict") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<?php } if($Settings['html_level']=="Transitional") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?php } if($Settings['html_level']=="Frameset") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<?php } // HTML meta tags and other html, head tags ?>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<?php $iWrappers['HTMLSTART'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<meta http-equiv="Content-Language" content="en" />
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Settings['charset']; ?>" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="Cache-Control" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Pragma" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
-<meta http-equiv="P3P" content='CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"' /> 
-<meta http-equiv="P3P" name="CP" content="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
-<?php 
-if(!isset($_SERVER['HTTP_USER_AGENT'])) {
-       $_SERVER['HTTP_USER_AGENT'] = ""; }
-if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") && 
-       !strpos($_SERVER['HTTP_USER_AGENT'], "opera")){ ?>
-<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-<?php } if(strpos($_SERVER['HTTP_USER_AGENT'], "chromeframe")) { ?>
-<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-<?php } $iWrappers['HTTPEQUIV'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<base href="<?php echo $BoardURL; ?>" />
-<?php if($Settings['showverinfo']=="on") { ?>
-<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"; ?>
-<meta name="Author" content="<?php echo $SettInfo['Author']; ?>" />
-<meta name="Keywords" content="<?php echo $SettInfo['Keywords']; ?>" />
-<meta name="Description" content="<?php echo $SettInfo['Description']; ?>" />
-<meta name="ROBOTS" content="Index, FOLLOW" />
-<meta name="revisit-after" content="1 days" />
-<meta name="GOOGLEBOT" content="Index, FOLLOW" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<?php if($Settings['showverinfo']=="on") { ?>
-<!-- generator="<?php echo $VerInfo['iDB_Ver_Show']; ?>" -->
-<?php } if($Settings['showverinfo']!="on") { ?>
-<!-- generator="<?php echo $iDB; ?>" -->
-<?php } echo "\n"; $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"; $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 if($Settings['showverinfo']=="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $VerInfo['iDB_Ver_Show']; ?>" />
-<?php } if($Settings['showverinfo']!="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $iDB; ?>" />
-<?php } echo "\n"; $iWrappers['LINKTAGS'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<?php if($ThemeSet['CSSType']=="import") { ?>
-<style type="text/css">
-/* Import the theme css file */
-<?php echo "\n@import url(\"".$ThemeSet['CSS']."\");\n"; ?>
-</style>
-<?php } if($ThemeSet['CSSType']=="sql") { ?>
-<style type="text/css">
-<?php echo $ThemeSet['CSS']; ?>
-</style>
-<?php } if($ThemeSet['CSSType']=="link") { ?>
-<link rel="prefetch alternate stylesheet" href="<?php echo $ThemeSet['CSS']; ?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo $ThemeSet['CSS']; ?>" />
-<?php } if($ThemeSet['CSSType']=="lowview") { ?>
-<style type="text/css">
-/* (Low View / Lo-Fi ) version start */
-body {
-background-color: #FFFFFF;
-color: #000000;
-font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
-font-size: 16px;
-margin: 20px;
-padding: 0px;
-}
-.copyright {
-text-align: center;
-font-family: Sans-Serif;
-font-size: 12px;
-line-height: 11px;
-color: #000000;
-}
-.EditReply {
-color: #000000;
-font-size: 9px;
-}
-</style>
-<?php } $iWrappers['CSSTHEME'] = ob_get_clean();
-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

diff --git a/inc/xhtml11.php b/inc/xhtml11.php
deleted file mode 100644 (file)
index d3166e1..0000000
--- a/inc/xhtml11.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Revised BSD License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Revised BSD License for more details.
-
-    Copyright 2004-2015 iDB Support - http://idb.berlios.de/
-    Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
-
-    $FileInfo: xhtml11.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
-*/
-$File3Name = basename($_SERVER['SCRIPT_NAME']);
-if ($File3Name=="xhtml11.php"||$File3Name=="/xhtml11.php") {
-       require('index.php');
-       exit(); }
-ob_start("idb_suboutput_handler");
-// Check to see if we serv the file as html or xhtml
-// if we do xhtml we also check to see if user's browser 
-// can dispay if or else fallback to html
-if($Settings['output_type']!="xhtml") {
-       $Settings['output_type'] = "xhtml"; }
-if($Settings['output_type']=="html") {
-       $ccstart = "//<!--"; $ccend = "//-->";
-header("Content-Type: text/html; charset=".$Settings['charset']); }
-if($Settings['output_type']=="xhtml") {
-if(stristr($_SERVER["HTTP_ACCEPT"],"application/xhtml+xml")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']); }
-else { if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-   header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']);
-} else { $ccstart = "//<!--"; $ccend = "//-->";
-       header("Content-Type: text/html; charset=".$Settings['charset']); } } }
-if($Settings['output_type']!="xhtml") {
-       if($Settings['output_type']!="html") {
-               $ccstart = "//<!--"; $ccend = "//-->";
-header("Content-Type: text/html; charset=".$Settings['charset']); } }
-if($checklowview===true) { $ThemeSet['CSSType'] = "lowview"; }
-if($checklowview===true&&$_GET['act']=="lowview") { 
-   $ThemeSet['CSSType'] = "lowview"; 
-   $ThemeSet['ThemeName'] = $OrgName." Low Theme";
-   $ThemeSet['ThemeMaker'] =$iDB_Author;
-   $ThemeSet['ThemeVersion'] = $VER1[0].".".$VER1[1].".".$VER1[2];
-   $ThemeSet['ThemeVersionType'] = $VER2[0];
-   $ThemeSet['ThemeSubVersion'] = $VER2[2]." ".$SubVerN;
-   $ThemeSet['MakerURL'] = $iDBHome."support/?act=lowview";
-   $ThemeSet['CopyRight'] = $ThemeSet['ThemeName']." was made by <a href=\"".$ThemeSet['MakerURL']."\" title=\"".$ThemeSet['ThemeMaker']."\">".$ThemeSet['ThemeMaker']."</a>";
-   $ThemeInfo['ThemeName'] = $ThemeSet['ThemeName'];
-   $ThemeInfo['ThemeMaker'] = $ThemeSet['ThemeMaker'];
-   $ThemeInfo['ThemeVersion'] = $ThemeSet['ThemeVersion'];
-   $ThemeInfo['ThemeVersionType'] = $ThemeSet['ThemeVersionType'];
-   $ThemeInfo['ThemeSubVersion'] = $ThemeSet['ThemeSubVersion'];
-   $ThemeInfo['MakerURL'] = $ThemeSet['MakerURL'];
-   $ThemeInfo['CopyRight'] = $ThemeSet['CopyRight']; }
-if($ThemeSet['CSSType']!="import"&&
-   $ThemeSet['CSSType']!="link"&&
-   $ThemeSet['CSSType']!="lowview"&&
-   $ThemeSet['CSSType']!="xml"&&
-   $ThemeSet['CSSType']!="sql") { 
-   $ThemeSet['CSSType'] = "import"; }
-if($ThemeSet['CSSType']=="xhtml") {
-   xml_tag_make("xml-stylesheet","type=text/css&href=".$ThemeSet['CSS']); }
-header("Content-Style-Type: text/css");
-header("Content-Script-Type: text/javascript");
-if($Settings['showverinfo']!="on") {
-$iDBURL1 = "<a href=\"".$iDBHome."\" title=\"".$iDB."\" onclick=\"window.open(this.href);return false;\">"; }
-if($Settings['showverinfo']=="on") {
-$iDBURL1 = "<a href=\"".$iDBHome."\" title=\"".$VerInfo['iDB_Ver_Show']."\" onclick=\"window.open(this.href);return false;\">"; }
-$GM2kURL = "<a href=\"".$GM2kHome."\" title=\"".$GM2k."\" onclick=\"window.open(this.href);return false;\">".$GM2k."</a>";
-$csryear = "2004"; $cryear = date("Y"); if($cryear<=2004) { $cryear = "2005"; }
-$BSDL = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=bsd",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\" title=\"".$RName." is dual-licensed under the Revised BSD License\">BSDL</a>";
-$GPL = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=bsd",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\" title=\"".$RName." is dual-licensed under the Gnu General Public License\">GPL</a>";
-$DualLicense = $BSDL." &amp; ".$GPL;
-$endpagevar = "<div class=\"copyright\">Powered by ".$iDBURL1.$RName."</a> &copy; ".$GM2kURL." @ ".$csryear." - ".$extext = null;
-if($checklowview!==true) { $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">Low-Version</a>"; }
-if($checklowview===true&&$_GET['act']!="lowview") { $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">Low-Version</a>"; }
-if($checklowview===true&&$_GET['act']=="lowview") {  $extext = "<a href=\"".url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'])."\">High-Version</a>"; }
-$endpagevar = "<div class=\"copyright\">Powered by ".$iDBURL1.$RName."</a> &copy; ".$GM2kURL." @ ".$csryear." - ".$cryear." <br />\n".$ThemeSet['CopyRight']." | ".$extext; 
-header("Content-Language: en");
-header("Vary: Accept-Encoding");
-// Check if we are on a secure HTTP connection
-if($_SERVER['HTTPS']=="on") { $prehost = "https://"; }
-if($_SERVER['HTTPS']!="on") { $prehost = "http://"; }
-// Get the board's url
-if($Settings['idburl']=="localhost"||$Settings['idburl']==null) {
-       $BoardURL = $prehost.$_SERVER["HTTP_HOST"].$basedir; }
-if($Settings['idburl']!="localhost"&&$Settings['idburl']!=null) {
-       $BoardURL = $Settings['idburl']; 
-       if($Settings['qstr']!="/") {
-       $AltBoardURL = $BoardURL; } 
-       if($Settings['qstr']=="/") { 
-       $AltBoardURL = preg_replace("/\/$/","",$BoardURL); } }
- // HTML Document Starts, HTML meta tags and other html, head tags ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
-   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<?php $iWrappers['HTMLSTART'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<meta http-equiv="Content-Language" content="en" />
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Settings['charset']; ?>" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="Cache-Control" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Pragma" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
-<meta http-equiv="P3P" content='CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"' /> 
-<meta http-equiv="P3P" name="CP" content="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
-<?php 
-if(!isset($_SERVER['HTTP_USER_AGENT'])) {
-       $_SERVER['HTTP_USER_AGENT'] = ""; }
-if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") && 
-       !strpos($_SERVER['HTTP_USER_AGENT'], "opera")){ ?>
-<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-<?php } if(strpos($_SERVER['HTTP_USER_AGENT'], "chromeframe")) { ?>
-<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-<?php } $iWrappers['HTTPEQUIV'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<base href="<?php echo $BoardURL; ?>" />
-<?php if($Settings['showverinfo']=="on") { ?>
-<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"; ?>
-<meta name="Author" content="<?php echo $SettInfo['Author']; ?>" />
-<meta name="Keywords" content="<?php echo $SettInfo['Keywords']; ?>" />
-<meta name="Description" content="<?php echo $SettInfo['Description']; ?>" />
-<meta name="ROBOTS" content="Index, FOLLOW" />
-<meta name="revisit-after" content="1 days" />
-<meta name="GOOGLEBOT" content="Index, FOLLOW" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<?php if($Settings['showverinfo']=="on") { ?>
-<!-- generator="<?php echo $VerInfo['iDB_Ver_Show']; ?>" -->
-<?php } if($Settings['showverinfo']!="on") { ?>
-<!-- generator="<?php echo $iDB; ?>" -->
-<?php } echo "\n"; $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"; $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 if($Settings['showverinfo']=="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $VerInfo['iDB_Ver_Show']; ?>" />
-<?php } if($Settings['showverinfo']!="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $iDB; ?>" />
-<?php } echo "\n"; $iWrappers['LINKTAGS'] = ob_get_clean(); 
-ob_start("idb_suboutput_handler"); ?>
-<?php if($ThemeSet['CSSType']=="import") { ?>
-<style type="text/css">
-/* Import the theme css file */
-<?php echo "\n@import url(\"".$ThemeSet['CSS']."\");\n"; ?>
-</style>
-<?php } if($ThemeSet['CSSType']=="sql") { ?>
-<style type="text/css">
-<?php echo $ThemeSet['CSS']; ?>
-</style>
-<?php } if($ThemeSet['CSSType']=="link") { ?>
-<link rel="prefetch alternate stylesheet" href="<?php echo $ThemeSet['CSS']; ?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo $ThemeSet['CSS']; ?>" />
-<?php } if($ThemeSet['CSSType']=="lowview") { ?>
-<style type="text/css">
-/* (Low View / Lo-Fi ) version start */
-body {
-background-color: #FFFFFF;
-color: #000000;
-font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
-font-size: 16px;
-margin: 20px;
-padding: 0px;
-}
-.copyright {
-text-align: center;
-font-family: Sans-Serif;
-font-size: 12px;
-line-height: 11px;
-color: #000000;
-}
-.EditReply {
-color: #000000;
-font-size: 9px;
-}
-</style>
-<?php } $iWrappers['CSSTHEME'] = ob_get_clean();
-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

diff --git a/install.php b/install.php
index 299fefd..10caddb 100644 (file)
--- a/install.php
+++ b/install.php
@@ -95,10 +95,11 @@ if ($_GET['act']!="Part4"&&$_POST['act']!="Part4") {
        $preact['idb'] = "installing";  }
 $SetupDir['setup'] = "setup/"; $ConvertDir['setup'] = $SetupDir['setup']; $SetupDir['sql'] = "setup/sql/"; 
 $SetupDir['convert'] = "setup/convert/"; $ConvertDir['convert'] = $SetupDir['convert']; $ConvertDir['sql'] = $SetupDir['sql'];
-$Settings['output_type'] = "html"; $Settings['html_type'] = "xhtml10";
+$Settings['output_type'] = "html"; $Settings['html_type'] = "html5";
 $Settings['board_name'] = "Installing iDB"; 
 if(!isset($Settings['charset'])) {
-       $Settings['charset'] = "ISO-8859-15"; }
+       $Settings['charset'] = "ISO-8859-15"; 
+       header("Content-Type: text/html; charset=ISO-8859-15"); }
 if(isset($Settings['charset'])) {
 if($Settings['charset']!="ISO-8859-15"&&$Settings['charset']!="ISO-8859-1"&&
        $Settings['charset']!="UTF-8"&&$Settings['charset']!="CP866"&&
@@ -106,7 +107,8 @@ if($Settings['charset']!="ISO-8859-15"&&$Settings['charset']!="ISO-8859-1"&&
        $Settings['charset']!="KOI8-R"&&$Settings['charset']!="BIG5"&&
        $Settings['charset']!="GB2312"&&$Settings['charset']!="BIG5-HKSCS"&&
        $Settings['charset']!="Shift_JIS"&&$Settings['charset']!="EUC-JP") {
-       $Settings['charset'] = "ISO-8859-15"; } }
+       $Settings['charset'] = "ISO-8859-15"; 
+       header("Content-Type: text/html; charset=ISO-8859-15"); } }
 $SQLCharset = "latin1";
 if(isset($_POST['charset'])) { 
 if($_POST['charset']=="ISO-8859-1") {
@@ -160,7 +162,7 @@ foreach($ThemeSet AS $key => $value) {
        $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}t/s", "get_time", $ThemeSet[$key]); 
        $ThemeSet[$key] = preg_replace("/\{percent\}p/s", "%", $ThemeSet[$key]); }
 require($SetupDir['convert'].'info.php');
-require($SetupDir['setup'].'xhtml10.php');
+require($SetupDir['setup'].'html5.php');
 $Error = null; $_GET['time'] = false;
 ?>
 
@@ -177,7 +179,7 @@ $Error = null; $_GET['time'] = false;
 <table class="Table1">
 <?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableColumn1" colspan="2"><span style="font-weight: bold; text-align: left;"><?php echo $ThemeSet['TitleIcon']; ?><a href="Install.php">Install <?php echo $VerInfo['iDB_Ver_Show']; ?> </a></span>
+<td class="TableColumn1"><span style="font-weight: bold; text-align: left;"><?php echo $ThemeSet['TitleIcon']; ?><a href="Install.php">Install <?php echo $VerInfo['iDB_Ver_Show']; ?> </a></span>
 </td>
 </tr><?php } ?>
 <tr class="TableRow2">

diff --git a/preindex.php b/preindex.php
index 012ccf3..f04bf8c 100644 (file)
--- a/preindex.php
+++ b/preindex.php
@@ -64,27 +64,8 @@ if($Settings['output_type']=="xhtm") {
 if($Settings['output_type']=="xml+htm") {
        $Settings['output_type'] = "xhtml"; }
 if($Settings['html_type']=="html5"||
-       $Settings['html_type']=="xhtml5") {
+       $Settings['html_type']=="xhtml5"||
+       ($Settings['html_type']!="html5"&&
+        $Settings['html_type']!="xhtml5")) {
 require($SettDir['inc'].'html5.php'); }
-if($Settings['html_type']=="xhtml10") {
-require($SettDir['inc'].'xhtml10.php'); }
-if($Settings['html_type']=="xhtml11") {
-if(stristr($_SERVER["HTTP_ACCEPT"],"application/xhtml+xml")) {
-$ccstart = "//<![CDATA["; $ccend = "//]]>";
-require($SettDir['inc'].'xhtml11.php'); } else {
-if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")||
-       stristr($_SERVER["HTTP_USER_AGENT"],"WDG_Validator")||
-       stristr($_SERVER["HTTP_USER_AGENT"],"WDG_SiteValidator")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-   require($SettDir['inc'].'xhtml11.php'); } else { 
-          $ccstart = "//<!--"; $ccend = "//-->";
-          $Settings['html_type']="xhtml10";
-          $Settings['html_level']="Strict";
-          require($SettDir['inc'].'xhtml10.php'); } } }
-if($Settings['html_type']!="xhtml10"&&
-       $Settings['html_type']!="xhtml11"&&
-       $Settings['html_type']!="html5"&&
-       $Settings['html_type']!="xhtml5") {
-       $ccstart = "//<!--"; $ccend = "//-->";
-       require($SettDir['inc'].'xhtml10.php'); }
 ?>

diff --git a/setup/xhtml10.php b/setup/html5.php
similarity index 72%
rename from setup/xhtml10.php
rename to setup/html5.php
index 0e8af56..d311021 100644 (file)
--- a/setup/xhtml10.php
+++ b/setup/html5.php
@@ -11,35 +11,32 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: xhtml10.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: html5.php - Last Update: 08/18/2015 SVN 798 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="xhtml10.php"||$File3Name=="/xhtml10.php") {
        require('index.php');
        exit(); }
-
+$XHTML5 = false;
 // Check to see if we serv the file as html or xhtml
 // if we do xhtml we also check to see if user's browser 
 // can dispay if or else fallback to html
 if($Settings['output_type']=="html") {
-       $ccstart = "//<!--"; $ccend = "//-->";
+       $ccstart = "//<!--"; $ccend = "//-->"; $XHTML5 = false;
 header("Content-Type: text/html; charset=".$Settings['charset']); }
 if($Settings['output_type']=="xhtml") {
 if(stristr($_SERVER["HTTP_ACCEPT"],"application/xhtml+xml")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
-       header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']); }
+       $ccstart = "//<![CDATA["; $ccend = "//]]>"; $XHTML5 = true;
+       header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']); }
 else { if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")) {
-       $ccstart = "//<![CDATA["; $ccend = "//]]>";
+       $ccstart = "//<![CDATA["; $ccend = "//]]>"; $XHTML5 = true;
    header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']);
-} else { $ccstart = "//<!--"; $ccend = "//-->";
+} else { $ccstart = "//<!--"; $ccend = "//-->"; $XHTML5 = false;
        header("Content-Type: text/html; charset=".$Settings['charset']); } } }
 if($Settings['output_type']!="xhtml") {
        if($Settings['output_type']!="html") {
-               $ccstart = "//<!--"; $ccend = "//-->";
+               $ccstart = "//<!--"; $ccend = "//-->"; $XHTML5 = false;
 header("Content-Type: text/html; charset=".$Settings['charset']); } }
-$Settings['js_ext'] = ".js";
 if($checklowview===true&&$_GET['act']=="lowview") { 
    $ThemeSet['CSSType'] = "lowview"; 
    $ThemeSet['ThemeName'] = $OrgName." Low Theme";
@@ -62,8 +59,6 @@ if($ThemeSet['CSSType']!="import"&&
    $ThemeSet['CSSType']!="xml"&&
    $ThemeSet['CSSType']!="sql") { 
    $ThemeSet['CSSType'] = "import"; }
-if($ThemeSet['CSSType']=="xhtml") {
-   xml_tag_make("xml-stylesheet","type=text/css&href=".$ThemeSet['CSS']); }
 header("Content-Style-Type: text/css");
 header("Content-Script-Type: text/javascript");
 if($Settings['showverinfo']!="on") {
@@ -99,28 +94,96 @@ if($Settings['html_level']!="Strict") {
        if($Settings['html_level']!="Transitional") {
                $Settings['html_level'] = "Transitional"; } }
 // HTML Document Starts
-if($Settings['html_level']=="Strict") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<?php } if($Settings['html_level']=="Transitional") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?php } if($Settings['html_level']=="Frameset") { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<?php } // HTML meta tags and other html, head tags ?>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+if($XHTML5===false) {
+?>
+<!DOCTYPE html>
+<?php // HTML meta tags and other html, head tags ?>
+<html lang="en">
+<?php } if($XHTML5===true) { ?>
+<!DOCTYPE html [
+<!ENTITY nbsp "&#160;">
+<!ENTITY copy "&#169;">
+<!ENTITY reg "&#174;">
+<!ENTITY Aacute "&#193;">
+<!ENTITY aacute "&#225;">
+<!ENTITY Agrave "&#224;">
+<!ENTITY agrave "&#192;">
+<!ENTITY Acirc "&#194;">
+<!ENTITY acirc "&#226;">
+<!ENTITY Auml "&#196;">
+<!ENTITY auml "&#228;">
+<!ENTITY Atilde "&#195;">
+<!ENTITY atilde "&#227;">
+<!ENTITY Aring "&#197;">
+<!ENTITY aring "&#229;">
+<!ENTITY Aelig "&#198;">
+<!ENTITY aelig "&#230;">
+<!ENTITY Ccedil "&#199;">
+<!ENTITY ccedil "&#231;">
+<!ENTITY Eth "&#208;">
+<!ENTITY eth "&#240;">
+<!ENTITY Eacute "&#201;">
+<!ENTITY eacute "&#233;">
+<!ENTITY Egrave "&#200;">
+<!ENTITY egrave "&#232;">
+<!ENTITY Ecirc "&#202;">
+<!ENTITY ecirc "&#234;">
+<!ENTITY Euml "&#203;">
+<!ENTITY euml "&#235;">
+<!ENTITY Iacute "&#205;">
+<!ENTITY iacute "&#237;">
+<!ENTITY Igrave "&#204;">
+<!ENTITY igrave "&#236;">
+<!ENTITY Icirc "&#206;">
+<!ENTITY icirc "&#238;">
+<!ENTITY Iuml "&#207;">
+<!ENTITY iuml "&#239;">
+<!ENTITY Ntilde "&#209;">
+<!ENTITY ntilde "&#241;">
+<!ENTITY Oacute "&#211;">
+<!ENTITY oacute "&#243;">
+<!ENTITY Ograve "&#210;">
+<!ENTITY ograve "&#242;">
+<!ENTITY Ocirc "&#212;">
+<!ENTITY ocirc "&#244;">
+<!ENTITY Ouml "&#214;">
+<!ENTITY ouml "&#246;">
+<!ENTITY Otilde "&#213;">
+<!ENTITY otilde "&#245;">
+<!ENTITY Oslash "&#216;">
+<!ENTITY oslash "&#248;">
+<!ENTITY szlig "&#223;">
+<!ENTITY Thorn "&#222;">
+<!ENTITY thorn "&#254;">
+<!ENTITY Uacute "&#218;">
+<!ENTITY uacute "&#250;">
+<!ENTITY Ugrave "&#217;">
+<!ENTITY ugrave "&#249;">
+<!ENTITY Ucirc "&#219;">
+<!ENTITY ucirc "&#251;">
+<!ENTITY Uuml "&#220;">
+<!ENTITY uuml "&#252;">
+<!ENTITY Yacute "&#221;">
+<!ENTITY yacute "&#253;">
+<!ENTITY yuml "&#255;">
+]>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<?php } ?>
 <head>
-<meta http-equiv="Content-Language" content="en" />
+<?php if($XHTML5===false) { ?>
+<meta charset="<?php echo $Settings['charset']; ?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Settings['charset']; ?>">
+<?php 
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
+       $_SERVER['HTTP_USER_AGENT'] = ""; }
+if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") && 
+       !strpos($_SERVER['HTTP_USER_AGENT'], "opera")){ ?>
+<meta http-equiv="X-UA-Compatible" content="IE=Edge">
+<?php } if(strpos($_SERVER['HTTP_USER_AGENT'], "chromeframe")) { ?>
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<?php } } if($XHTML5===true) { ?>
+<meta charset="<?php echo $Settings['charset']; ?>" />
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Settings['charset']; ?>" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="Cache-Control" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Pragma" content="private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
-<meta http-equiv="P3P" content='CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"' /> 
-<meta http-equiv="P3P" name="CP" content="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT" />
-<meta http-equiv="Expires" content="<?php echo gmdate("D, d M Y H:i:s")." GMT"; ?>" />
 <?php 
 if(!isset($_SERVER['HTTP_USER_AGENT'])) {
        $_SERVER['HTTP_USER_AGENT'] = ""; }
@@ -129,7 +192,7 @@ if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") &&
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 <?php } if(strpos($_SERVER['HTTP_USER_AGENT'], "chromeframe")) { ?>
 <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-<?php } ?>
+<?php } } ?>
 <base href="<?php echo $BoardURL; ?>" />
 <?php if($Settings['showverinfo']=="on") { ?>
 <meta name="Generator" content="<?php echo $VerInfo['iDB_Ver_Show']; ?>" />
@@ -140,10 +203,7 @@ if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") &&
 <meta name="Keywords" content="<?php echo $SettInfo['Keywords']; ?>" />
 <meta name="Description" content="<?php echo $SettInfo['Description']; ?>" />
 <meta name="ROBOTS" content="Index, FOLLOW" />
-<meta name="revisit-after" content="1 days" />
 <meta name="GOOGLEBOT" content="Index, FOLLOW" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
 <?php if($Settings['showverinfo']=="on") { ?>
 <!-- generator="<?php echo $VerInfo['iDB_Ver_Show']; ?>" -->
 <?php } if($Settings['showverinfo']!="on") { ?>
@@ -151,15 +211,8 @@ if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") &&
 <?php } echo "\n"; ?>
 
 <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"; ?>
-<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 if($Settings['showverinfo']=="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $VerInfo['iDB_Ver_Show']; ?>" />
-<?php } if($Settings['showverinfo']!="on") { ?>
-<link rel="Generator" href="<?php echo $iDBHome; ?>" title="<?php echo $iDB; ?>" />
-<?php } echo "\n"; ?>
-<?php if($ThemeSet['CSSType']=="import") { ?>
+<?php echo "\n";
+if($ThemeSet['CSSType']=="import") { ?>
 <style type="text/css">
 /* Import the theme css file */
 <?php echo "\n@import url(\"".$ThemeSet['CSS']."\");\n"; ?>
@@ -194,7 +247,8 @@ color: #000000;
 font-size: 9px;
 }
 </style>
-<?php } if($ThemeSet['FavIcon']!=null) { ?>
+<?php }
+if($ThemeSet['FavIcon']!=null) { ?>
 <link rel="icon" href="<?php echo $ThemeSet['FavIcon']; ?>" />
 <link rel="shortcut icon" href="<?php echo $ThemeSet['FavIcon']; ?>" />
 <?php } ?>
\ No newline at end of file

diff --git a/setup/setup.php b/setup/setup.php
index ca97922..65a9400 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -200,8 +200,8 @@ for ($i=0; $i < count($timezone_identifiers); $i++) {
 </tr><tr>
        <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLType">HTML Type to use:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="HTMLType" id="HTMLType">
-       <option value="xhtml10">XHTML 1.0</option>
-       <option value="xhtml11">XHTML 1.1</option>
+       <!--<option value="xhtml10">XHTML 1.0</option>-->
+       <!--<option value="xhtml11">XHTML 1.1</option>-->
        <option value="html5">HTML 5</option>
        <option value="xhtml5">XHTML 5</option>
        </select></td>

diff --git a/sql.php b/sql.php
index 53b1913..bf9f852 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2015 iDB Support - http://idb.berlios.de/
     Copyright 2004-2015 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 08/18/2015 SVN 797 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 08/19/2015 SVN 799 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -34,7 +34,6 @@ if(!defined("E_DEPRECATED")) { define("E_DEPRECATED", 0); }
 @error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 /* 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);