From 4dc1e804d90c8c12253c6afb08b1d25d75288f4f Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Wed, 10 Sep 2014 15:56:36 +0200
Subject: [PATCH] [TASK] TemplateService: Add verbose option
The TemplateService class contains the functionality
to parse the TypoScript constants that haven't
been replaced yet.
This is done each time in the frontend, although
it is only useful when $this->tt_track is active,
thus when a BE user is logged in, who can read the info.
The improvement in this patch is to skip the strstr()
check if not set, thus making first-hit page calls a bit
quicker and the code more readable.
Releases: 6.3
Resolves: #61512
Change-Id: I8ebdb5e4bdc643e24dc9328ef48ed91a67376636
Reviewed-on: http://review.typo3.org/32706
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../Classes/TypoScript/TemplateService.php | 42 ++++++++++++++-----
.../TypoScriptFrontendController.php | 1 +
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index b1acc136e343..3d8b6a568ea5 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -27,6 +27,15 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
class TemplateService {
// Debugging, analysis:
+ /**
+ * option to enable logging, time-tracking (FE-only)
+ * usually, this is only done when
+ * - in FE a BE_USER is logged-in
+ * - in BE when the BE_USER needs information about the template (TypoScript module)
+ * @var bool
+ */
+ protected $verbose = FALSE;
+
// If set, the global tt-timeobject is used to log the performance.
/**
* @todo Define visibility
@@ -303,6 +312,14 @@ class TemplateService {
$this->processExtensionStatics = (bool) $processExtensionStatics;
}
+ /**
+ * sets the verbose parameter
+ * @param bool $verbose
+ */
+ public function setVerbose($verbose) {
+ $this->verbose = (bool)$verbose;
+ }
+
/**
* Initialize
* MUST be called directly after creating a new template-object
@@ -940,19 +957,24 @@ class TemplateService {
if ($this->tt_track) {
$GLOBALS['TT']->pull();
}
+
// Searching for possible unsubstituted constants left (only for information)
- if (strstr($all, '{$')) {
- $theConstList = array();
- $findConst = explode('{$', $all);
- array_shift($findConst);
- foreach ($findConst as $constVal) {
- $constLen = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(strcspn($constVal, '}'), 0, 50);
- $theConstList[] = '{$' . substr($constVal, 0, ($constLen + 1));
- }
- if ($this->tt_track) {
- $GLOBALS['TT']->setTSlogMessage(implode(', ', $theConstList) . ': Constants may remain un-substituted!!', 2);
+ if ($this->verbose) {
+ if (strstr($all, '{$')) {
+ $theConstList = array();
+ $findConst = explode('{$', $all);
+ array_shift($findConst);
+ foreach ($findConst as $constVal) {
+ $constLen = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(strcspn($constVal, '}'), 0, 50);
+ $theConstList[] = '{$' . substr($constVal, 0, ($constLen + 1));
+ }
+ if ($this->tt_track) {
+ $GLOBALS['TT']->setTSlogMessage(implode(', ', $theConstList) . ': Constants may remain un-substituted!!', 2);
+ }
}
+
}
+
// Logging the textual size of the TypoScript Setup field text with all constants substituted:
if ($this->tt_track) {
$GLOBALS['TT']->setTSlogMessage('TypoScript template size as textfile: ' . strlen($all) . ' bytes');
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 8676c59b93dd..dce83dfb29f0 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -2308,6 +2308,7 @@ class TypoScriptFrontendController {
*/
public function initTemplate() {
$this->tmpl = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\TemplateService');
+ $this->tmpl->setVerbose((bool)$this->beUserLogin);
$this->tmpl->init();
$this->tmpl->tt_track = (bool)$this->beUserLogin;
}
--
GitLab