From d979fd0c393880233143e10b8ac6a6899f9db4c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 20 Nov 2009 17:21:05 +0000
Subject: [PATCH] Now extension code must be inserted like {%ext,version=foo%}

---
 inc/filters.php                                       | 11 +++++++++--
 templates/de/html/login_failed_js.tpl                 |  2 +-
 templates/de/html/member/member_order_send.tpl        |  2 +-
 .../de/html/member/member_surfbar_book_dynamic.tpl    |  2 +-
 .../de/html/member/member_surfbar_book_static.tpl     |  2 +-
 .../html/member/member_surfbar_edit_action_form.tpl   |  2 +-
 templates/de/html/page_header.tpl                     |  2 +-
 templates/de/html/surfbar/surfbar_stopped.tpl         |  2 +-
 templates/de/html/uberwach/uberwach_snippet.tpl       |  2 +-
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/inc/filters.php b/inc/filters.php
index 4e9356c2c8..89af47dbfd 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -478,12 +478,19 @@ function FILTER_COMPILE_EXTENSION ($code) {
 
 				// And continue with next entry
 				continue;
-			} else {
+			} elseif (substr($cmd, 0 , 3) == 'ext') {
+				// Get the extension command
+				$extCmd = explode(',', $cmd);
+				$extCmd = $extCmd[1];
+
 				// Construct call-back function name
-				$functionName = 'getExtension' . ucfirst(strtolower($cmd));
+				$functionName = 'getExtension' . ucfirst(strtolower($extCmd));
 
 				// Construct call of the function
 				$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
+			} else {
+				// Unknown command detected
+				debug_report_bug('Unknown command ' . $cmd . ' detected.');
 			}
 
 			// Replace it and insert parameter for GET request
diff --git a/templates/de/html/login_failed_js.tpl b/templates/de/html/login_failed_js.tpl
index ecc75f507e..53908c0f02 100644
--- a/templates/de/html/login_failed_js.tpl
+++ b/templates/de/html/login_failed_js.tpl
@@ -1 +1 @@
-<script src="{%url=js.php?js=cookies_disabled%}{%version=sql_patches%}" type="text/javascript"></script>
+<script src="{%url=js.php?js=cookies_disabled%}{%ext,version=sql_patches%}" type="text/javascript"></script>
diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl
index 7c7b5b3a0d..fae55abed3 100644
--- a/templates/de/html/member/member_order_send.tpl
+++ b/templates/de/html/member/member_order_send.tpl
@@ -1,5 +1,5 @@
 <form accept-charset="utf-8" id="form" action="{%url=modules.php?module=order&amp;order=$content%}" method="post" target="_parent" onsubmit="return Submit()">
 {--MEMBER_ORDER_PLEASE_WAIT_1--}<span id="counter" style="font-weight:bold">10</span>{--MEMBER_ORDER_PLEASE_WAIT_2--}<br />
 <input type="submit" class="member_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
-<script type="text/javascript" src="{%url=js.php?js=order_send%}{%version=order%}"></script>
+<script type="text/javascript" src="{%url=js.php?js=order_send%}{%ext,version=order%}"></script>
 </form>
diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl
index 9b78058aaa..c51dbde392 100644
--- a/templates/de/html/member/member_surfbar_book_dynamic.tpl
+++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl
@@ -34,7 +34,7 @@
 	</div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_book%}{%version=surfbar%}" type="text/javascript"></script>
+<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}" type="text/javascript"></script>
 </form>
 
 <span align="center" class="member_note" style="padding:5px">
diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl
index 51e131db9d..70445dd72f 100644
--- a/templates/de/html/member/member_surfbar_book_static.tpl
+++ b/templates/de/html/member/member_surfbar_book_static.tpl
@@ -34,6 +34,6 @@
 	</div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_book%}{%version=surfbar%}" type="text/javascript"></script>
+<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}" type="text/javascript"></script>
 
 </form>
diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl
index 288df314f0..f0708cbedb 100644
--- a/templates/de/html/member/member_surfbar_edit_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl
@@ -27,6 +27,6 @@
 	</div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_edit%}{%version=surfbar%}&amp;views_max=$content[views_max]&amp;limited=$content[limited]"
+<script src="{%url=js.php?js=surfbar_member_edit%}{%ext,version=surfbar%}&amp;views_max=$content[views_max]&amp;limited=$content[limited]"
  type="text/javascript"></script>
 </form>
diff --git a/templates/de/html/page_header.tpl b/templates/de/html/page_header.tpl
index c40672b248..dfd6add475 100644
--- a/templates/de/html/page_header.tpl
+++ b/templates/de/html/page_header.tpl
@@ -7,4 +7,4 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="language" content="de" />
 
-<script src="{%url=js.php?js=jquery%}{%version=sql_patches%}" type="text/javascript"></script>
+<script src="{%url=js.php?js=jquery%}{%ext,version=sql_patches%}" type="text/javascript"></script>
diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl
index 5b01934238..d904d81540 100644
--- a/templates/de/html/surfbar/surfbar_stopped.tpl
+++ b/templates/de/html/surfbar/surfbar_stopped.tpl
@@ -11,5 +11,5 @@
 	</div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_stopped?}{%version=surfbar%}&amp;restart={?surfbar_restart_?me?}&amp;autostart=$content[autostart]"
+<script src="{%url=js.php?js=surfbar_stopped?}{%ext,version=surfbar%}&amp;restart={?surfbar_restart_?me?}&amp;autostart=$content[autostart]"
  type="text/javascript"></script>
diff --git a/templates/de/html/uberwach/uberwach_snippet.tpl b/templates/de/html/uberwach/uberwach_snippet.tpl
index e990b396e2..4050da7b58 100644
--- a/templates/de/html/uberwach/uberwach_snippet.tpl
+++ b/templates/de/html/uberwach/uberwach_snippet.tpl
@@ -3,6 +3,6 @@
 <script type="text/javascript">/* <![CDATA[ */
 au_ip='$content[REMOTE_ADDR]';
 /* ]]> */</script>
-<script src="{%url=js.php?js=uberwach%}{%version=uberwach%}" type="text/javascript"></script>
+<script src="{%url=js.php?js=uberwach%}{%ext,version=uberwach%}" type="text/javascript"></script>
 <noscript><a href="http://www.uberwach.de/" rel="external" target="_blank" title="Aktion: &Uuml;berwach!">?mg src="http://www.uberwach.de/wanze.gif" alt="Aktion UBERWACH!" width="80" height="15" border="0" /></a></noscript>
 <!-- ende uberwach code -->
-- 
2.39.5