[ticket/11388] includejs inherit from includeasset

Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388

phpBB/includes/template/twig/node/includeasset.php

@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includeasset extends Twig_Node
+{
+	/** @var Twig_Environment */
+	protected $environment;
+
+	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
+
+		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+	}
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
+
+		$config = $this->environment->get_phpbb_config();
+
+		$compiler
+			->write("\$asset_file = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$argument_string = '?assets_version={$config['assets_version']}';\n")
+			->write("\$anchor_string = '';\n")
+			->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n")
+			->indent()
+				->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n")
+				->write("\$asset_file = substr(\$asset_file, 0, \$argument_string_start);\n")
+				->write("if ((\$anchor_string_start = strpos(\$argument_string, '#')) !== false) {\n")
+				->indent()
+					->write("\$anchor_string = substr(\$argument_string, \$anchor_string_start);\n")
+					->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n")
+				->outdent()
+				->write("}\n")
+				->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n")
+			->outdent()
+			->write("}\n")
+			->write("if (strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
+			->indent()
+				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
+			->outdent()
+			->write("}\n")
+			->write("\$asset_file .= \$argument_string . \$anchor_string;\n")
+			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
+		;
+
+		$this->append_asset($compiler);
+
+		$compiler
+			->raw("\n');\n")
+		;
+	}
+}

phpBB/includes/template/twig/node/includejs.php

@@ -7,25 +7,11 @@
 *
 */
 
-/**
+class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
 {
-	exit;
+	public function get_definition_name()
-}
-
-
-class phpbb_template_twig_node_includejs extends Twig_Node
 	{
-	/** @var Twig_Environment */
+		return 'SCRIPTS';
-	protected $environment;
-
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-	{
-		$this->environment = $environment;
-
-		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
 	}
 
 	/**
@@ -33,24 +19,14 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	protected function append_asset(Twig_Compiler $compiler)
 	{
-		$compiler->addDebugInfo($this);
-
 		$config = $this->environment->get_phpbb_config();
 
 		$compiler
-			->write("\$js_file = ")
+			->raw("<script type=\"text/javascript\" src=\"' . ")
-			->subcompile($this->getNode('expr'))
+			->raw("\$asset_file")
-			->raw(";\n")
+			->raw(". '\"></script>\n")
-			->write("if (!file_exists(\$js_file)) {\n")
-			->indent()
-				->write("\$js_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$js_file);\n")
-			->outdent()
-			->write("}\n")
-			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
-			->raw("\$js_file")
-			->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
 		;
 	}
 }