From: Kazuki Przyborowski Date: Wed, 3 Nov 2010 02:43:50 +0000 (+0000) Subject: Another update to XHTML5. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc82fd691baf49776fb96c966402d2054e80aec1;p=idb%2FiDB.git.git Another update to XHTML5. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@595 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- diff --git a/inc/html5.php b/inc/html5.php index 17e19c2..ac2476e 100644 --- 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 = "//"; $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 = "//"; $XHTML5 = true; header("Content-Type: application/xhtml+xml; charset=".$Settings['charset']); - xml_doc_start("1.0",$Settings['charset']); } else { $ccstart = "//"; $XHTML5 = false; header("Content-Type: text/html; charset=".$Settings['charset']); } } } if($Settings['output_type']!="xhtml") { @@ -102,6 +100,73 @@ if($XHTML5===false) { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> diff --git a/inc/versioninfo.php b/inc/versioninfo.php index e835f50..d5eefac 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: 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 --- 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 = "//"; require($SettDir['inc'].'xhtml10.php'); } ?>