Merge pull request #9 from TheLalaMan/feature/do-not-show-tracking-co…

…de-with-empty-configuration Do not show the tracking code with empty or invalid settings
Flowpack · Dec 16, 2016 · 431131e · 431131e
2 parents 86bcac9 + ee6a43e
commit 431131e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Resources/Private/TypoScript/Prototypes/TrackingCode.ts2 b/Resources/Private/TypoScript/Prototypes/TrackingCode.ts2
@@ -1,6 +1,13 @@
 # A Piwik tracking code object
 #
 prototype(Portachtzig.Neos.Piwik:TrackingCode) < prototype(TYPO3.TypoScript:Template) {
-	@if.inLiveWorkspace = ${node.context.workspaceName == 'live'}
 	templatePath = 'resource://Portachtzig.Neos.Piwik/Private/Templates/Prototypes/TrackingCode.html'
+	settings = ${Configuration.setting('Portachtzig.Neos.Piwik')}
+
+	// Show tracking code only in live workspace and if all necessary parameters are set
+	@if {
+		inLiveWorkspace = ${node.context.workspaceName == 'live'}
+		hostIsSet = ${settings.host}
+		idSiteIsSet = ${settings.idSite}
+	}
 }
diff --git a/Resources/Private/TypoScript/Root.ts2 b/Resources/Private/TypoScript/Root.ts2
@@ -4,9 +4,5 @@ prototype(TYPO3.Neos:Page) {
   piwikTrackingCode = Portachtzig.Neos.Piwik:TrackingCode {
     # Google suggests to include the tracking code directly after the <body> tag
     @position = 'end'
-    settings = ${Configuration.setting('Portachtzig.Neos.Piwik')}
-
   }
-}
-
-
+}