projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
580b6e3
)
Now extension code must be inserted like {%ext,version=foo%}
author
Roland Häder
<roland@mxchange.org>
Fri, 20 Nov 2009 17:21:05 +0000
(17:21 +0000)
committer
Roland Häder
<roland@mxchange.org>
Fri, 20 Nov 2009 17:21:05 +0000
(17:21 +0000)
inc/filters.php
patch
|
blob
|
history
templates/de/html/login_failed_js.tpl
patch
|
blob
|
history
templates/de/html/member/member_order_send.tpl
patch
|
blob
|
history
templates/de/html/member/member_surfbar_book_dynamic.tpl
patch
|
blob
|
history
templates/de/html/member/member_surfbar_book_static.tpl
patch
|
blob
|
history
templates/de/html/member/member_surfbar_edit_action_form.tpl
patch
|
blob
|
history
templates/de/html/page_header.tpl
patch
|
blob
|
history
templates/de/html/surfbar/surfbar_stopped.tpl
patch
|
blob
|
history
templates/de/html/uberwach/uberwach_snippet.tpl
patch
|
blob
|
history
diff --git
a/inc/filters.php
b/inc/filters.php
index 4e9356c2c89a978a48de96f6c1ccc4d812077074..89af47dbfd6a1edc52f03a0a3af8c7c047ee8f83 100644
(file)
--- a/
inc/filters.php
+++ b/
inc/filters.php
@@
-478,12
+478,19
@@
function FILTER_COMPILE_EXTENSION ($code) {
// And continue with next entry
continue;
// 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
// Construct call-back function name
- $functionName = 'getExtension' . ucfirst(strtolower($
c
md));
+ $functionName = 'getExtension' . ucfirst(strtolower($
extC
md));
// Construct call of the function
$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
// 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
}
// 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 ecc75f507e41911c495aba95a5a46de759325443..53908c0f027889f965b2b817f7d51da89eb205d6 100644
(file)
--- 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 7c7b5b3a0da1428d8cdc281592956c4e769d9311..fae55abed3847cc37fe1b72de051122ee6e61619 100644
(file)
--- 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&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--}" />
<form accept-charset="utf-8" id="form" action="{%url=modules.php?module=order&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>
</form>
diff --git
a/templates/de/html/member/member_surfbar_book_dynamic.tpl
b/templates/de/html/member/member_surfbar_book_dynamic.tpl
index 9b78058aaac334bc5ca2f904ce2852afdc97d9fe..c51dbde392b5f7a2dbbdc14c79bd80423272333d 100644
(file)
--- 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>
</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">
</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 51e131db9d071cb3d6d258106f465ac4716c149f..70445dd72f006069fd4569ae50d829a955c131be 100644
(file)
--- 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>
</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>
</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 288df314f0a8c92766272ecd8d4434c52ae163a8..f0708cbedbedc277462c06ac883b1788caf3a7f7 100644
(file)
--- 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>
</div>
</div>
-<script src="{%url=js.php?js=surfbar_member_edit%}{%version=surfbar%}&views_max=$content[views_max]&limited=$content[limited]"
+<script src="{%url=js.php?js=surfbar_member_edit%}{%
ext,
version=surfbar%}&views_max=$content[views_max]&limited=$content[limited]"
type="text/javascript"></script>
</form>
type="text/javascript"></script>
</form>
diff --git
a/templates/de/html/page_header.tpl
b/templates/de/html/page_header.tpl
index c40672b24877424733e076b732e32f3db3aa7d26..dfd6add4755589555586d2dc5045017872deff11 100644
(file)
--- 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" />
<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 5b01934238e71ebd7ad63deb5208888dfddd3f7d..d904d815409b63c6672b05645ccdac06b6c1eec0 100644
(file)
--- a/
templates/de/html/surfbar/surfbar_stopped.tpl
+++ b/
templates/de/html/surfbar/surfbar_stopped.tpl
@@
-11,5
+11,5
@@
</div>
</div>
</div>
</div>
-<script src="{%url=js.php?js=surfbar_stopped?}{%version=surfbar%}&restart={?surfbar_restart_?me?}&autostart=$content[autostart]"
+<script src="{%url=js.php?js=surfbar_stopped?}{%
ext,
version=surfbar%}&restart={?surfbar_restart_?me?}&autostart=$content[autostart]"
type="text/javascript"></script>
type="text/javascript"></script>
diff --git
a/templates/de/html/uberwach/uberwach_snippet.tpl
b/templates/de/html/uberwach/uberwach_snippet.tpl
index e990b396e2fece57c958545e5a30932a455ff776..4050da7b583d74015b554e298f20832edfb038b3 100644
(file)
--- 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 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: Überwach!">?mg src="http://www.uberwach.de/wanze.gif" alt="Aktion UBERWACH!" width="80" height="15" border="0" /></a></noscript>
<!-- ende uberwach code -->
<noscript><a href="http://www.uberwach.de/" rel="external" target="_blank" title="Aktion: Überwach!">?mg src="http://www.uberwach.de/wanze.gif" alt="Aktion UBERWACH!" width="80" height="15" border="0" /></a></noscript>
<!-- ende uberwach code -->