OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7394f6)
Another update to XHTML5.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 3 Nov 2010 02:43:50 +0000 (02:43 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 3 Nov 2010 02:43:50 +0000 (02:43 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@595 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/html5.php patch | blob | history
inc/versioninfo.php patch | blob | history
preindex.php patch | blob | history

diff --git a/inc/html5.php b/inc/html5.php
index 17e19c2..ac2476e 100644 (file)
--- a/inc/html5.php
+++ b/inc/html5.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: html5.php - Last Update: 11/02/2010 SVN 594 - Author: cooldude2k $
+    $FileInfo: html5.php - Last Update: 11/02/2010 SVN 595 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="xhtml10.php"||$File3Name=="/xhtml10.php") {
@@ -27,12 +27,10 @@ header("Content-Type: text/html; charset=".$Settings['charset']); }
 if($Settings['output_type']=="xhtml") {
 if(stristr($_SERVER["HTTP_ACCEPT"],"application/xhtml+xml")) {
        $ccstart = "//<![CDATA["; $ccend = "//]]>"; $XHTML5 = true;
-       header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']); }
+       header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']); }
 else { if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")) {
        $ccstart = "//<![CDATA["; $ccend = "//]]>"; $XHTML5 = true;
    header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']);
-       xml_doc_start("1.0",$Settings['charset']);
 } else { $ccstart = "//<!--"; $ccend = "//-->"; $XHTML5 = false;
        header("Content-Type: text/html; charset=".$Settings['charset']); } } }
 if($Settings['output_type']!="xhtml") {
@@ -102,6 +100,73 @@ if($XHTML5===false) {
 <?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>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index e835f50..d5eefac 100644 (file)
--- 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: 11/02/2010 SVN 594 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/02/2010 SVN 595 - 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] = 2; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 594; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 595; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 11; $SVNDay[1] = 02; $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);
diff --git a/preindex.php b/preindex.php
index 2ac8b4d..bd695c9 100644 (file)
--- a/preindex.php
+++ b/preindex.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: preindex.php - Last Update: 09/30/2010 SVN 564 - Author: cooldude2k $
+    $FileInfo: preindex.php - Last Update: 11/02/2010 SVN 595 - Author: cooldude2k $
 */
 $pretime = explode(" ", microtime());
 $utime = $pretime[0];
@@ -53,7 +53,8 @@ if($Settings['output_type']=="xhtm") {
        $Settings['output_type'] = "xhtml"; }
 if($Settings['output_type']=="xml+htm") {
        $Settings['output_type'] = "xhtml"; }
-if($Settings['html_type']=="html5") {
+if($Settings['html_type']=="html5"||
+       $Settings['html_type']=="xhtml5") {
 require($SettDir['inc'].'html5.php'); }
 if($Settings['html_type']=="xhtml10") {
 require($SettDir['inc'].'xhtml10.php'); }
@@ -72,7 +73,8 @@ if (stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator")||
           require($SettDir['inc'].'xhtml10.php'); } } }
 if($Settings['html_type']!="xhtml10"&&
        $Settings['html_type']!="xhtml11"&&
-       $Settings['html_type']!="html5") {
+       $Settings['html_type']!="html5"&&
+       $Settings['html_type']!="xhtml5") {
        $ccstart = "//<!--"; $ccend = "//-->";
        require($SettDir['inc'].'xhtml10.php'); }
 ?>
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