Fixed bug #9095: xhtml in the backend by default (Thanks to Christian Kuhn)
authorBenni Mack <benni.mack@typo3.org>
Thu, 14 Aug 2008 21:40:50 +0000 (21:40 +0000)
committerBenni Mack <benni.mack@typo3.org>
Thu, 14 Aug 2008 21:40:50 +0000 (21:40 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3977 709f56b5-9817-0410-a4d7-c38de5d9e867

63 files changed:
ChangeLog
t3lib/class.t3lib_tceforms_inline.php
typo3/alt_clickmenu.php
typo3/alt_db_navframe.php
typo3/alt_doc.php
typo3/alt_doc_nodoc.php
typo3/alt_file_navframe.php
typo3/alt_intro.php
typo3/alt_menu.php
typo3/alt_menu_sel.php
typo3/alt_palette.php
typo3/alt_shortcut.php
typo3/alt_toplogo.php
typo3/alt_topmenu_dummy.php
typo3/backend.php
typo3/browse_links.php
typo3/class.browse_links.php
typo3/db_list.php
typo3/db_new.php
typo3/dummy.php
typo3/file_edit.php
typo3/file_list.php
typo3/file_newfolder.php
typo3/file_rename.php
typo3/file_upload.php
typo3/index.php
typo3/listframe_loader.php
typo3/mod/help/about/index.php
typo3/mod/tools/em/class.em_index.php
typo3/mod/user/ws/index.php
typo3/mod/user/ws/publish.php
typo3/mod/user/ws/workspaceforms.php
typo3/mod/web/func/index.php
typo3/mod/web/info/index.php
typo3/mod/web/perm/index.php
typo3/move_el.php
typo3/show_item.php
typo3/show_rechis.php
typo3/sysext/belog/mod/index.php
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/dbal/mod1/index.php
typo3/sysext/impexp/app/index.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/rtehtmlarea/mod2/class.tx_rtehtmlarea_acronym_mod.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_dam_browse_links.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/setup/mod/index.php
typo3/sysext/taskcenter/task/index.php
typo3/sysext/tsconfig_help/mod1/index.php
typo3/sysext/tstemplate/ts/index.php
typo3/sysext/version/cm1/index.php
typo3/template.php
typo3/view_help.php
typo3/wizard_colorpicker.php
typo3/wizard_forms.php
typo3/wizard_rte.php
typo3/wizard_table.php
typo3/wizard_tsconfig.php

index 8d63096..e830555 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-14  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #9095: xhtml in the backend by default (Thanks to Christian Kuhn)
+
 2008-08-14  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed bug #9167: Feature: Mark extension as write protected (together with Steffen Kamper)
@@ -11,7 +15,7 @@
        * Fixed bug #8988: htmlArea RTE: Pasting text from MS Word to Firefox 3 brings a lot of garbage
        * Follow-up for issue #8799: htmlArea RTE: correction to two path settings
 
-2008-08-12  Dmitry Dulepov  <dmotry@typo3.org>
+2008-08-12  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed bug #9060: Wrong alert text in Constant editor
 
index 3160d52..b1153d6 100755 (executable)
@@ -1028,7 +1028,6 @@ class t3lib_TCEforms_inline {
                        // Create an instance of the document template object
                $SOBE->doc = t3lib_div::makeInstance('template');
                $SOBE->doc->backPath = $GLOBALS['BACK_PATH'];
-               $SOBE->doc->docType = 'xhtml_trans';
                        // Initialize TCEforms (rendering the forms)
                $SOBE->tceforms = t3lib_div::makeInstance('t3lib_TCEforms');
                $SOBE->tceforms->inline =& $this;
@@ -2375,4 +2374,4 @@ class t3lib_TCEforms_inline {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_inline.php'])  {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms_inline.php']);
 }
-?>
\ No newline at end of file
+?>
index bc5ac4a..f1c1434 100755 (executable)
@@ -1603,7 +1603,6 @@ class SC_alt_clickmenu {
                        // Initialize template object
                if (!$this->ajax)       {
                        $this->doc = t3lib_div::makeInstance('template');
-                       $this->doc->docType='xhtml_trans';
                        $this->doc->backPath = $BACK_PATH;
                }
 
index fdb622a..136a5de 100755 (executable)
@@ -150,7 +150,6 @@ class SC_alt_db_navframe {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/alt_db_navframe.html');
-               $this->doc->docType  = 'xhtml_trans';
 
                        // get HTML-Template
 
index c94d6ba..78f93cd 100755 (executable)
@@ -451,7 +451,6 @@ class SC_alt_doc {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/alt_doc.html');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->form = '<form action="'.htmlspecialchars($this->R_URI).'" method="post" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" name="editform" onsubmit="document.editform._scrollPosition.value=(document.documentElement.scrollTop || document.body.scrollTop); return TBE_EDITOR.checkSubmit(1);">';
 
                $this->doc->loadJavascriptLib('contrib/prototype/prototype.js');
index e6e2f7d..4b8f92a 100755 (executable)
@@ -98,7 +98,6 @@ class SC_alt_doc_nodoc {
 
                        // Start the template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->bodyTagMargins['x']=5;
                $this->doc->bodyTagMargins['y']=5;
                $this->doc->backPath = $BACK_PATH;
@@ -204,4 +203,4 @@ $SOBE = t3lib_div::makeInstance('SC_alt_doc_nodoc');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 0a2e2a7..beab85b 100755 (executable)
@@ -124,7 +124,6 @@ class SC_alt_file_navframe {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/alt_file_navframe.html');
-               $this->doc->docType = 'xhtml_trans';
 
                        // Adding javascript code for AJAX (prototype), drag&drop and the filetree as well as the click menu code
                $this->doc->getDragDropCode('folders');
index 49dd8b2..e92599d 100755 (executable)
@@ -107,7 +107,6 @@ class SC_alt_intro {
 
                $alt_menuObj = t3lib_div::makeInstance('alt_menu_functions');
 
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $TBE_TEMPLATE->divClass = $TBE_TEMPLATE->bodyTagId;
                $this->content.= $TBE_TEMPLATE->startPage('About modules');
 
@@ -177,4 +176,4 @@ $SOBE = t3lib_div::makeInstance('SC_alt_intro');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index dccda10..bf73111 100755 (executable)
@@ -120,7 +120,6 @@ class SC_alt_menu {
        function main() {
                global $BE_USER,$TYPO3_CONF_VARS,$TBE_TEMPLATE;
 
-               $TBE_TEMPLATE->docType='xhtml_trans';
                $TBE_TEMPLATE->divClass='vertical-menu';
                $TBE_TEMPLATE->bodyTagAdditions = 'onload="top.restoreHighlightedModuleMenuItem()"';
 
@@ -232,4 +231,4 @@ $SOBE = t3lib_div::makeInstance('SC_alt_menu');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 538c8d6..9696c34 100755 (executable)
@@ -88,7 +88,6 @@ class SC_alt_menu_sel {
 
                        // Start page
                $TBE_TEMPLATE->form = '<form action="">';
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
 
                        // add menu JS
                $alt_menuObj = t3lib_div::makeInstance('alt_menu_functions');
index 12bbabd..483057e 100755 (executable)
@@ -264,7 +264,6 @@ class SC_alt_palette {
                $this->doc->bodyTagMargins['x']=0;
                $this->doc->bodyTagMargins['y']=0;
                $this->doc->form='<form action="#" method="post" name="'.htmlspecialchars($this->formName).'" onsubmit="return false;">';
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->backPath = '';
 
                        // In case the palette is opened in a SEPARATE window (as the case is with frontend editing) then another body-tag id should be used (so we don't get the background image for the palette shown!)
@@ -366,4 +365,4 @@ $SOBE = t3lib_div::makeInstance('SC_alt_palette');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index da00b0e..83a93fe 100755 (executable)
@@ -250,7 +250,6 @@ class SC_alt_shortcut {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->form='<form action="alt_shortcut.php" name="shForm" method="post">';
-               $this->doc->docType='xhtml_trans';
                $this->doc->divClass='typo3-shortcut';
                $this->doc->JScode.=$this->doc->wrapScriptTags('
                        function jump(url,modName,mainModName)  {       //
index cbd1e47..2e1dc8b 100755 (executable)
@@ -76,8 +76,6 @@ class SC_alt_toplogo {
                global $TBE_TEMPLATE,$TBE_STYLES;
 
                        // Start page
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
-
                $this->content.=$TBE_TEMPLATE->startPage('Logo frame');
 
                        // Set logo:
index 605cb61..77458f0 100755 (executable)
@@ -118,7 +118,6 @@ class SC_alt_topmenu_dummy {
                        $alt_menuObj = t3lib_div::makeInstance('alt_menu_functions');
 
                                // Start page
-                       $TBE_TEMPLATE->docType = 'xhtml_trans';
                        $TBE_TEMPLATE->bodyTagId.= '-iconmenu';
                        $TBE_TEMPLATE->JScodeArray[] = $alt_menuObj->generateMenuJScode($loadModules->modules);
 
@@ -166,7 +165,6 @@ class SC_alt_topmenu_dummy {
                global $TBE_TEMPLATE;
 
                        // Start page
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $this->content.=$TBE_TEMPLATE->startPage('Top frame dummy display');
 
                        // End page:
@@ -203,4 +201,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/alt_t
 $SOBE = t3lib_div::makeInstance('SC_alt_topmenu_dummy');
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index d2f2c3f..a38f79c 100644 (file)
@@ -202,9 +202,6 @@ class TYPO3backend {
                 * now put the complete backend document together
                 ******************************************************/
 
-                       // set doctype
-               $GLOBALS['TBE_TEMPLATE']->docType = 'xhtml_trans';
-
                        // add javascript
                foreach($this->jsFiles as $jsFile) {
                        $GLOBALS['TBE_TEMPLATE']->JScode .= '
@@ -750,4 +747,4 @@ if(is_array($GLOBALS['TYPO3_CONF_VARS']['typo3/backend.php']['additionalBackendI
 
 $TYPO3backend->render();
 
-?>
\ No newline at end of file
+?>
index 1477015..173c6c3 100755 (executable)
@@ -122,7 +122,6 @@ class SC_browse_links {
                        // Creating backend template object:
                        // this might not be needed but some classes refer to $GLOBALS['SOBE']->doc, so ...
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
        }
 
@@ -245,4 +244,4 @@ $SOBE = t3lib_div::makeInstance('SC_browse_links');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index fb6c2e1..745ce3b 100755 (executable)
@@ -883,7 +883,6 @@ class browse_links {
 
                        // Creating backend template object:
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
 
                        // Load the Prototype library and browse_links.js
index 8c2c066..0abc1fd 100755 (executable)
@@ -206,7 +206,6 @@ class SC_db_list {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/db_list.html');
-               $this->doc->docType='xhtml_trans';
 
                        // Loading current page record and checking access:
                $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
index dfc2f53..c71d336 100755 (executable)
@@ -183,7 +183,6 @@ class SC_db_new {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/db_new.html');
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->JScode='';
 
                        // Setting up the context sensitive menu:
index 41fe47a..3d76f65 100755 (executable)
@@ -77,7 +77,6 @@ class SC_dummy {
                global $TBE_TEMPLATE;
 
                        // Start page
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $this->content.=$TBE_TEMPLATE->startPage('Dummy document');
 
                        // End page:
index 04a16da..1cc695a 100755 (executable)
@@ -143,7 +143,6 @@ class SC_file_edit {
                // Setting template object
                // ***************************
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/file_edit.html');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->JScode=$this->doc->wrapScriptTags('
@@ -276,4 +275,4 @@ $SOBE = t3lib_div::makeInstance('SC_file_edit');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index da5cd02..ef16cf5 100755 (executable)
@@ -168,7 +168,6 @@ class SC_file_list {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/file_list.html');
-               $this->doc->docType = 'xhtml_trans';
 
                        // Validating the input "id" (the path, directory!) and checking it against the mounts of the user.
                $this->id = $this->basicFF->is_directory($this->id);
index 3d4b478..63e742f 100755 (executable)
@@ -146,7 +146,6 @@ class SC_file_newfolder {
 
                        // Setting template object
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/file_newfolder.html');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->JScode=$this->doc->wrapScriptTags('
@@ -306,4 +305,4 @@ $SOBE = t3lib_div::makeInstance('SC_file_newfolder');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index d155785..af90534 100755 (executable)
@@ -144,7 +144,6 @@ class SC_file_rename {
 
                        // Setting template object
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/file_rename.html');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->JScode=$this->doc->wrapScriptTags('
@@ -240,4 +239,4 @@ $SOBE = t3lib_div::makeInstance('SC_file_rename');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 960c700..e3eb334 100755 (executable)
@@ -155,7 +155,6 @@ class SC_file_upload {
 
                        // Setting template object
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/file_upload.html');
                $this->doc->backPath = $BACK_PATH;
 
index cf74c11..9ec20ed 100755 (executable)
@@ -168,7 +168,6 @@ class SC_index {
                global $TBE_TEMPLATE, $TYPO3_CONF_VARS, $BE_USER;
 
                        // Initialize template object:
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $TBE_TEMPLATE->bodyTagAdditions = ' onload="startUp();"';
                $TBE_TEMPLATE->moduleTemplate = $TBE_TEMPLATE->getHtmlTemplate('templates/login.html');
 
index ec005cf..1838cc4 100755 (executable)
@@ -75,7 +75,6 @@ class SC_listframe_loader {
        function main() {
                global $TBE_TEMPLATE;
 
-               $TBE_TEMPLATE->docType='xhtml_trans';
                $TBE_TEMPLATE->divClass='';
                $this->content.=$TBE_TEMPLATE->startPage('List Frame Loader');
                $this->content.=$TBE_TEMPLATE->wrapScriptTags('
@@ -104,4 +103,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/listf
 // Make instance:
 $SOBE = t3lib_div::makeInstance('SC_listframe_loader');
 $SOBE->main();
-?>
\ No newline at end of file
+?>
index e59a7e4..7dbb0a4 100755 (executable)
@@ -98,7 +98,6 @@ class SC_mod_help_about_index {
                // **************************
                #$TBE_TEMPLATE->bgColor = '#cccccc';
                $TBE_TEMPLATE->backPath = $GLOBALS['BACK_PATH'];
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $this->content.= $TBE_TEMPLATE->startPage('About');
 
                $minorText = sprintf($LANG->getLL('minor'), 'TYPO3 Ver. '.htmlspecialchars(TYPO3_version).', Copyright &copy; '.htmlspecialchars(TYPO3_copyright_year), 'Kasper Sk&aring;rh&oslash;j');
@@ -184,4 +183,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/h
 $SOBE = t3lib_div::makeInstance('SC_mod_help_about_index');
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 183e3a1..c2a2f99 100644 (file)
@@ -407,7 +407,6 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/em_index.html');
-               $this->doc->docType='xhtml_trans';
 
                        // JavaScript
                $this->doc->JScode = $this->doc->wrapScriptTags('
index d96a682..fdf7eba 100755 (executable)
@@ -253,7 +253,6 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/ws.html');
-               $this->doc->docType = 'xhtml_trans';
 
                        // JavaScript
                $plusIcon = t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/ol/plusbullet.gif', 'width="18" height="16"', 1);
index 26136be..8e0bc54 100644 (file)
@@ -97,7 +97,6 @@ class SC_mod_user_ws_publish extends t3lib_SCbase {
                // Initialize Document Template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->JScode = '<script type="text/javascript">/*<![CDATA[*/
                        function closeAndReload() {
                                //window.opener.location.reload(); window.close();
@@ -268,4 +267,4 @@ $SOBE = t3lib_div::makeInstance('SC_mod_user_ws_publish');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index c38ed6c..9b0be11 100644 (file)
@@ -140,7 +140,6 @@ class SC_mod_user_ws_workspaceForms extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('templates/ws_forms.html');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->form = '<form action="' . t3lib_div::getIndpEnv('SCRIPT_NAME').'" method="post" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" name="editform" onsubmit="return TBE_EDITOR.checkSubmit(1);">';
 
                $this->doc->getContextMenuCode();
index 6ad57f6..05bd6e6 100755 (executable)
@@ -107,7 +107,6 @@ class SC_mod_web_func_index extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/func.html');
-               $this->doc->docType = 'xhtml_trans';
 
                // **************************
                // Main
index eb9a208..af7f24a 100755 (executable)
@@ -104,7 +104,6 @@ class SC_mod_web_info_index extends t3lib_SCbase {
                        $this->doc = t3lib_div::makeInstance('template');
                        $this->doc->backPath = $BACK_PATH;
                        $this->doc->setModuleTemplate('templates/info.html');
-                       $this->doc->docType = 'xhtml_trans';
                        $this->doc->tableLayout = Array (
                                '0' => Array (
                                        '0' => Array('<td valign="top"><b>','</b></td>'),
index c3fa419..de9353b 100755 (executable)
@@ -215,7 +215,6 @@ class SC_mod_web_perm_index {
                        // Initializing document template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/perm.html');
                $this->doc->form = '<form action="'.$GLOBALS['BACK_PATH'].'tce_db.php" method="post" name="editform">';
                $this->doc->loadJavascriptLib('../t3lib/jsfunc.updateform.js');
index 05c957a..34781a7 100755 (executable)
@@ -270,7 +270,6 @@ class SC_move_el {
 
                        // Starting the document template object:
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/move_el.html');
                $this->doc->JScode='';
index 0586764..e0127ea 100755 (executable)
@@ -209,7 +209,6 @@ class SC_show_item {
                        // Initialize document template object:
                $this->doc = t3lib_div::makeInstance('smallDoc');
                $this->doc->backPath = $BACK_PATH;
-               $this->doc->docType = 'xhtml_trans';
 
                        // Starting the page by creating page header stuff:
                $this->content.=$this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:show_item.php.viewItem'));
@@ -581,4 +580,4 @@ $SOBE = t3lib_div::makeInstance('SC_show_item');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 6710c02..e371361 100755 (executable)
@@ -96,7 +96,6 @@ class SC_show_rechis {
                        // Create internal template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->setModuleTemplate('templates/show_rechis.html');
 
                        // Start the page header:
index 7ba65c1..9382a0b 100755 (executable)
@@ -84,7 +84,6 @@ class SC_mod_tools_log_index {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/belog.html');
-               $this->doc->docType = 'xhtml_trans';
 
                                // JavaScript
                $this->doc->JScode = '
index c1d881a..762548b 100755 (executable)
@@ -1130,7 +1130,6 @@ class SC_mod_tools_be_user_index {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('templates/beuser.html');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->form='<form action="" method="POST">';
 
                                // JavaScript
index f0f5106..46b3274 100755 (executable)
@@ -407,7 +407,6 @@ class SC_db_layout {
                        $this->doc = t3lib_div::makeInstance('template');
                        $this->doc->backPath = $BACK_PATH;
                        $this->doc->setModuleTemplate('templates/db_layout.html');
-                       $this->doc->docType='xhtml_trans';
 
                                // JavaScript:
                        $this->doc->JScode = '<script type="text/javascript" src="'.$BACK_PATH.'../t3lib/jsfunc.updateform.js"></script>';
@@ -547,7 +546,6 @@ class SC_db_layout {
 
                                // If no access or id value, create empty document:
                        $this->doc = t3lib_div::makeInstance('template');
-                       $this->doc->docType='xhtml_trans';
                        $this->doc->backPath = $BACK_PATH;
                        $this->doc->setModuleTemplate('templates/db_layout.html');
 
index d1a7492..36ec38d 100644 (file)
@@ -199,7 +199,6 @@ class SC_db_new_content_el {
 
                        // Starting the document template object:
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/db_new_content_el.html');
                $this->doc->JScode='';
index 0770824..1bd0e4f 100644 (file)
@@ -79,7 +79,6 @@ class tx_dbal_module1 extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('noDoc');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->form='<form action="" method="post">';
-               $this->doc->docType = 'xhtml_trans';
 
                        // JavaScript
                $this->doc->JScode = $this->doc->wrapScriptTags('
index 0f773e0..8a738d9 100755 (executable)
@@ -292,7 +292,6 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Start document template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
                $this->doc->backPath = $BACK_PATH;
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->bodyTagId = 'imp-exp-mod';
 
                                // JavaScript
index 83e55fd..acd27f6 100755 (executable)
@@ -102,7 +102,6 @@ class SC_mod_tools_config_index {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/config.html');
-               $this->doc->docType='xhtml_trans';
 
                                // JavaScript
                $this->doc->JScode = '
index 8435193..372580d 100755 (executable)
@@ -120,7 +120,6 @@ class SC_mod_tools_dbint_index {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/dbint.html');
-               $this->doc->docType='xhtml_trans';
                $this->doc->form='<form action="" method="post" name="'.$this->formName.'">';
 
                                // JavaScript
index 8048dd9..fbe0516 100644 (file)
@@ -50,7 +50,6 @@ class tx_rtehtmlarea_acronym_mod {
                global $BE_USER,$LANG,$BACK_PATH;
                
                $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->styleSheetFile = "";
                $this->doc->styleSheetFile_post = "";
index 7753cdf..6cfa23a 100644 (file)
@@ -370,7 +370,6 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                        // Creating backend template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->bodyTagAdditions = 'onLoad="initDialog();"';
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
 
                        // BEGIN accumulation of header JavaScript:
@@ -1182,4 +1181,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtml
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php']);
 }
 
-?>
\ No newline at end of file
+?>
index 9df5952..acac2b7 100644 (file)
@@ -288,7 +288,6 @@ class tx_rtehtmlarea_dam_browse_links extends tx_dam_browse_media {
                        // Creating backend template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->bodyTagAdditions = 'onLoad="initDialog();"';
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
        }
 
@@ -945,4 +944,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtml
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/mod3/class.tx_rtehtmlarea_dam_browse_links.php']);
 }
 
-?>
\ No newline at end of file
+?>
index e7e2e5f..6800911 100644 (file)
@@ -247,7 +247,6 @@ class tx_rtehtmlarea_dam_browse_media extends tx_dam_browse_media {
                        // Creating backend template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->bodyTagAdditions = 'onLoad="initDialog();"';
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
        }
 
@@ -1074,4 +1073,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtml
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php']);
 }
 
-?>
\ No newline at end of file
+?>
index b41d9e8..07ec729 100644 (file)
@@ -176,7 +176,6 @@ class tx_rtehtmlarea_select_image extends browse_links {
                        // Creating backend template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->bodyTagAdditions = $this->getBodyTagAdditions();
-               $this->doc->docType= 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                
                        // Load the Prototype library and browse_links.js
@@ -1212,4 +1211,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtml
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php']);
 }
 
-?>
\ No newline at end of file
+?>
index dfb8961..8acdb82 100755 (executable)
@@ -246,7 +246,6 @@ class SC_mod_user_setup_index {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/setup.html');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->JScodeLibArray['dyntabmenu'] = $this->doc->getDynTabMenuJScode();
 
                $this->doc->form = '<form action="index.php" method="post" name="usersetup" enctype="application/x-www-form-urlencoded">';
index 3044ba3..cb38f9b 100755 (executable)
@@ -90,7 +90,6 @@ class SC_mod_user_task_index extends t3lib_SCbase {
 
                /* Setup document template */
                $this->doc = t3lib_div::makeInstance('noDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->divClass = '';
                $this->doc->form = '<form action="index.php" method="POST" name="editform">';
                $this->backPath = $this->doc->backPath = $BACK_PATH;
index 749e73a..e261998 100644 (file)
@@ -92,7 +92,6 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/tsconfig_help.html');
-               $this->doc->docType = 'xhtml_trans';
 
                if ($access || $BE_USER->user['admin']) {
 
index e247b1c..67220b1 100644 (file)
@@ -107,7 +107,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('templates/tstemplate.html');
-               $this->doc->docType = 'xhtml_trans';
 
                if ($this->id && $this->access) {
                        $this->doc->form = '<form action="index.php?id=' . $this->id . '" method="post" enctype="' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'] . '" name="editForm">';
index affcfc2..9486077 100755 (executable)
@@ -200,7 +200,6 @@ class tx_version_cm1 extends t3lib_SCbase {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->setModuleTemplate('templates/version.html');
-               $this->doc->docType = 'xhtml_trans';
 
                // Add styles
                $this->doc->inDocStylesArray[$GLOBALS['MCONF']['name']] = '
index 1a81754..45ee7dc 100755 (executable)
@@ -175,7 +175,7 @@ class template {
        var $JScode='';                                 // Additional header code (eg. a JavaScript section) could be accommulated in this var. It will be directly outputted in the header.
        var $JScodeArray = array();             // Similar to $JScode but for use as array with associative keys to prevent double inclusion of JS code. a <script> tag is automatically wrapped around.
        var $postCode='';                               // Additional 'page-end' code could be accommulated in this var. It will be outputted at the end of page before </body> and some other internal page-end code.
-       var $docType = '';                              // Doc-type used in the header. Default is HTML 4. You can also set it to 'strict', 'xhtml_trans', or 'xhtml_frames'.
+       var $docType = '';                              // Doc-type used in the header. Default is xhtml_trans. You can also set it to 'html_3', 'xhtml_strict' or 'xhtml_frames'.
        var $moduleTemplate = '';               // HTML template with markers for module
 
                // Other vars you can change, but less frequently used:
@@ -632,32 +632,33 @@ class template {
                header ('Content-Type:text/html;charset='.$this->charset);
 
                switch($this->docType)  {
+                       case 'html_3':
+                               $headerStart = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">';
+                               break;
                        case 'xhtml_strict':
-                               $headerStart= '<!DOCTYPE html
+                               $headerStart = '<!DOCTYPE html
        PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <?xml version="1.0" encoding="'.$this->charset.'"?>
 <?xml-stylesheet href="#internalStyle" type="text/css"?>
 ';
-                       break;
-                       case 'xhtml_trans':
-                               $headerStart= '<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?xml version="1.0" encoding="'.$this->charset.'"?>
-<?xml-stylesheet href="#internalStyle" type="text/css"?>
-';
-                       break;
+                               break;
                        case 'xhtml_frames':
-                               $headerStart= '<!DOCTYPE html
+                               $headerStart = '<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
 <?xml version="1.0" encoding="'.$this->charset.'"?>
 ';
-                       break;
+                               break;
+                       // The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
+                       case 'xhtml_trans':
                        default:
-                               $headerStart='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">';
-                       break;
+                               $headerStart = '<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="'.$this->charset.'"?>
+<?xml-stylesheet href="#internalStyle" type="text/css"?>
+';
                }
 
                // This loads the tabulator-in-textarea feature. It automatically modifies
index af28ecd..a3959f7 100755 (executable)
@@ -174,7 +174,6 @@ class SC_view_help {
                global $BE_USER,$LANG,$TCA_DESCR,$TCA,$TBE_TEMPLATE;
 
                        // Start HTML output accumulation:
-               $TBE_TEMPLATE->docType = 'xhtml_trans';
                $TBE_TEMPLATE->divClass = 'typo3-view-help';
                $this->content.= $TBE_TEMPLATE->startPage($LANG->getLL('title'));
 
@@ -886,4 +885,4 @@ $SOBE = t3lib_div::makeInstance('SC_view_help');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index bceca98..8ec1017 100755 (executable)
@@ -144,7 +144,6 @@ class SC_wizard_colorpicker {
                        // Initialize document object:
                $this->doc = t3lib_div::makeInstance('smallDoc');
                $this->doc->backPath = $BACK_PATH;
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->JScode = $this->doc->wrapScriptTags('
                        function checkReference()       {       //
                                if (parent.opener && parent.opener.document && parent.opener.document.'.$this->formName.' && parent.opener.document.'.$this->formName.'["'.$this->fieldName.'"])        {
@@ -459,4 +458,4 @@ $SOBE = t3lib_div::makeInstance('SC_wizard_colorpicker');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>
index 5f1ae17..7440204 100755 (executable)
@@ -218,7 +218,6 @@ class SC_wizard_forms {
 
                        // Document template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->JScode=$this->doc->wrapScriptTags('
                        function jumpToUrl(URL,formEl)  {       //
index 3001108..7fd0f4a 100755 (executable)
@@ -113,7 +113,6 @@ class SC_wizard_rte {
 
                        // Starting the document template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->divClass = '';      // Need to NOT have the page wrapped in DIV since if we do that we destroy the feature that the RTE spans the whole height of the page!!!
                $this->doc->form='<form action="tce_db.php" method="post" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" name="editform" onsubmit="return TBE_EDITOR.checkSubmit(1);">';
                $this->doc->backPath = $BACK_PATH;
index e1b8ff3..fd77de6 100755 (executable)
@@ -134,7 +134,6 @@ class SC_wizard_table {
 
                        // Document template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->JScode=$this->doc->wrapScriptTags('
                        function jumpToUrl(URL,formEl)  {       //
index 97cc0db..0782512 100755 (executable)
@@ -174,7 +174,6 @@ class SC_wizard_tsconfig {
 
                        // Init the document table object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
-               $this->doc->docType = 'xhtml_trans';
                $this->doc->backPath = $BACK_PATH;
                $this->doc->form='<form action="" name="editform">';
 
@@ -660,4 +659,4 @@ $SOBE = t3lib_div::makeInstance('SC_wizard_tsconfig');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>