Remove the command scheduler JavaScript from the "fe_page" template

contao · Apr 16, 2014 · a90a355 · Toflar · Apr 16, 2014 · a90a355
1 parent 16f5c7e
commit a90a355
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 33 deletions.
diff --git a/system/modules/core/classes/Frontend.php b/system/modules/core/classes/Frontend.php
@@ -623,7 +623,7 @@ protected function prepareMetaDescription($strText)
 	 * Return the cron timeout in seconds
 	 * @return integer
 	 */
-	protected function getCronTimeout()
+	public static function getCronTimeout()
 	{
 		if (!empty($GLOBALS['TL_CRON']['minutely']))
 		{

diff --git a/system/modules/core/library/Contao/Controller.php b/system/modules/core/library/Contao/Controller.php
@@ -1838,6 +1838,32 @@ public static function replaceDynamicScriptTags($strBuffer)
 			}
 		}
 
+		$strSearchCron = '';
+
+		// Add to search index
+		if (\Config::get('enableSearch'))
+		{
+			$strSearchCron .= 'setTimeout(function(){try{var e=new XMLHttpRequest}catch(t){return}e.open("GET",window.location.href,!0),e.setRequestHeader("Index-Page",!0),e.setRequestHeader("X-Requested-With","XMLHttpRequest"),e.send()},1e4);';
+		}
+
+		// Command scheduler
+		if (!\Config::get('disableCron'))
+		{
+			$strSearchCron .= 'setTimeout(function(){var e=function(e,t){try{var n=new XMLHttpRequest}catch(r){return}n.open("GET",e,!0),n.onreadystatechange=function(){this.readyState==4&&this.status==200&&typeof t=="function"&&t(this.responseText)},n.send()},t="system/cron/cron.";e(t+"txt",function(n){parseInt(n||0)<Math.round(+(new Date)/1e3)-' . \Frontend::getCronTimeout() . '&&e(t+"php")})},5e3);';
+		}
+
+		if ($strSearchCron != '')
+		{
+			if ($blnXhtml)
+			{
+				$strScripts .= "\n" . '<script type="text/javascript">' . "\n/* <![CDATA[ */\n" . $strSearchCron . "\n/* ]]> */\n" . '</script>' . "\n";
+			}
+			else
+			{
+				$strScripts .= "\n" . '<script>' . $strSearchCron . '</script>' . "\n";
+			}
+		}
+
 		$arrReplace['[[TL_BODY]]'] = $strScripts;
 		$strScripts = '';
 

diff --git a/system/modules/core/pages/PageRegular.php b/system/modules/core/pages/PageRegular.php
@@ -444,22 +444,6 @@ protected function createTemplate($objPage, $objLayout)
 			$GLOBALS['TL_JAVASCRIPT'] = array_merge($GLOBALS['TL_JAVASCRIPT'], $arrAppendJs);
 		}
 
-		$strJsBottom = '';
-
-		// Add to search index
-		if (\Config::get('enableSearch'))
-		{
-			$strJsBottom .= 'setTimeout(function(){try{var e=new XMLHttpRequest}catch(t){return}e.open("GET",window.location.href,!0),e.setRequestHeader("Index-Page",!0),e.setRequestHeader("X-Requested-With","XMLHttpRequest"),e.send()},1e4);';
-		}
-
-		$intTimeout = $this->getCronTimeout();
-
-		// Command scheduler
-		if (!\Config::get('disableCron'))
-		{
-			$strJsBottom .= 'setTimeout(function(){var e=function(e,t){try{var n=new XMLHttpRequest}catch(r){return}n.open("GET",e,!0),n.onreadystatechange=function(){this.readyState==4&&this.status==200&&typeof t=="function"&&t(this.responseText)},n.send()},t="system/cron/cron.";e(t+"txt",function(n){parseInt(n||0)<Math.round(+(new Date)/1e3)-' . $intTimeout . '&&e(t+"php")})},5e3);';
-		}
-
 		// Initialize the sections
 		$this->Template->header = '';
 		$this->Template->left = '';
@@ -477,8 +461,7 @@ protected function createTemplate($objPage, $objLayout)
 		$this->Template->charset = \Config::get('characterSet');
 		$this->Template->base = \Environment::get('base');
 		$this->Template->disableCron = \Config::get('disableCron');
-		$this->Template->cronTimeout = $intTimeout;
-		$this->Template->jsBottom = $strJsBottom;
+		$this->Template->cronTimeout = $this->getCronTimeout();
 	}
 
 

diff --git a/system/modules/core/templates/frontend/fe_page.html5 b/system/modules/core/templates/frontend/fe_page.html5
@@ -76,11 +76,5 @@
 
   <?php echo $this->mootools; ?>
 
-  <?php if ($this->jsBottom): ?>
-    <script>
-      <?php echo $this->jsBottom; ?>
-    </script>
-  <?php endif; ?>
-
 </body>
 </html>
diff --git a/system/modules/core/templates/frontend/fe_page.xhtml b/system/modules/core/templates/frontend/fe_page.xhtml
@@ -77,13 +77,5 @@
 
   <?php echo $this->mootools; ?>
 
-  <?php if ($this->jsBottom): ?>
-    <script type="text/javascript">
-      /* <![CDATA[ */
-      <?php echo $this->jsBottom; ?>
-      /* ]]> */
-    </script>
-  <?php endif; ?>
-
 </body>
 </html>