[TASK] Remove last DocumentTemplate section calls 45/44445/2
authorWouter Wolters <typo3@wouterwolters.nl>
Sat, 31 Oct 2015 16:18:49 +0000 (17:18 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 31 Oct 2015 19:17:24 +0000 (20:17 +0100)
Resolves: #71205
Releases: master
Change-Id: Ie1a3436ba97243db2e5caa34b956317d8df604c6
Reviewed-on: https://review.typo3.org/44445
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/backend/Classes/History/RecordHistory.php
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php

index b29c61e..b8a6151 100644 (file)
@@ -411,7 +411,7 @@ class RecordHistory
                        </form>
                ';
 
-        return $GLOBALS['SOBE']->doc->section('', $content, false, true, false, false);
+        return '<div>' . $content . '</div>';
     }
 
     /**
@@ -544,7 +544,7 @@ class RecordHistory
         $theCode .= '<br /><br />';
 
         // Add the whole content as a module section:
-        return $GLOBALS['SOBE']->doc->section($languageService->getLL('changes'), $theCode, false, true);
+        return '<h2>' . $languageService->getLL('changes', true) . '</h2><div>' . $theCode . '</div>';
     }
 
     /**
@@ -583,7 +583,8 @@ class RecordHistory
                 $elParts = explode(':', $key);
                 $titleLine = $this->createRollbackLink($key, $languageService->getLL('revertRecord', true), 1) . $this->generateTitle($elParts[0], $elParts[1]);
                 $record = '<div style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">' . $record . '</div>';
-                $content .= $GLOBALS['SOBE']->doc->section($titleLine, $record, false, false, false, true);
+                // $titleLine contains HTML, no htmlspecialchars here.
+                $content .= '<h3>' . $titleLine . '</h3><div>' . $record . '</div>';
             }
             $content = $this->createRollbackLink(
                     'ALL',
@@ -593,7 +594,7 @@ class RecordHistory
         } else {
             $content = $languageService->getLL('noDifferences', true);
         }
-        return $GLOBALS['SOBE']->doc->section($languageService->getLL('mergedDifferences', true), $content, false, true, false, true);
+        return '<h2>' . $languageService->getLL('mergedDifferences', true) . '</h2><div>' . $content . '</div>';
     }
 
     /**
index 07a46e3..ab2edf0 100644 (file)
@@ -223,9 +223,9 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
     public function main()
     {
         if ($this->P['table'] && $this->P['field'] && $this->P['uid']) {
-            $this->content .= $this->doc->section($this->getLanguageService()->getLL('forms_title'), $this->formsWizard(), 0, 1);
+            $this->content .= '<h2>' . $this->getLanguageService()->getLL('forms_title', true) . '</h2><div>' . $this->formsWizard() . '</div>';
         } else {
-            $this->content .= $this->doc->section($this->getLanguageService()->getLL('forms_title'), '<span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', 1) . '</span>', 0, 1);
+            $this->content .= '<h2>' . $this->getLanguageService()->getLL('forms_title', true) . '<div><span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', true) . '</span></div>';
         }
         // Setting up the buttons and markers for docheader
         $docHeaderButtons = $this->getButtons();
index f3d07bf..2ee4e6e 100644 (file)
@@ -434,7 +434,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
      */
     protected function getNoBrokenLinkMessage(array $brokenLinksMarker)
     {
-        $brokenLinksMarker['LIST_HEADER'] = $this->doc->sectionHeader($this->getLanguageService()->getLL('list.header'));
+        $brokenLinksMarker['LIST_HEADER'] = '<h3>' . $this->getLanguageService()->getLL('list.header', true) . '</h3>';
         /** @var $message FlashMessage */
         $message = GeneralUtility::makeInstance(
             FlashMessage::class,
@@ -468,7 +468,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
             $makerTableHead[$column] = BackendUtility::wrapInHelp('linkvalidator', $column, $label);
         }
         // Add section header
-        $makerTableHead['list_header'] = $this->doc->sectionHeader($this->getLanguageService()->getLL('list.header'));
+        $makerTableHead['list_header'] = '<h3>' . $this->getLanguageService()->getLL('list.header', true) . '</h3>';
         return $makerTableHead;
     }
 
@@ -559,7 +559,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
         }
         $checkOptionsTemplate = $this->templateService->getSubpart($this->doc->moduleTemplate, '###CHECKOPTIONS_SECTION###');
         $hookSectionTemplate = $this->templateService->getSubpart($checkOptionsTemplate, '###HOOK_SECTION###');
-        $markerArray['statistics_header'] = $this->doc->sectionHeader($this->getLanguageService()->getLL('report.statistics.header'));
+        $markerArray['statistics_header'] = '<h3>' . $this->getLanguageService()->getLL('report.statistics.header', true) . '</h3>';
         $markerArray['total_count_label'] = BackendUtility::wrapInHelp('linkvalidator', 'checkboxes', $this->getLanguageService()->getLL('overviews.nbtotal'));
         $markerArray['total_count'] = $brokenLinkOverView['brokenlinkCount'] ?: '0';