More rewrites to make use of the EL

diff --git a/surfbar.php b/surfbar.php
index e835e927dddf0ed613607da04f8d6fca88c17dc2..d65986193579c31409ff9397d53c0c4cabba1839 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -195,13 +195,6 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
                        // Then prepare other content
                        $content = array(
                                'url_id'      => $nextId,
-                               'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
-                               'salt'        => SURFBAR_GET_SALT(),
-                               'reward'      => translateComma(SURFBAR_GET_REWARD($nextId)),
-                               'url'         => SURFBAR_GET_URL($nextId),
-                               'curr_reload' => SURFBAR_GET_USER_LOCKS(),
-                               'max_urls'    => SURFBAR_GET_TOTAL_URLS(),
-                               'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
                                'xxx'         => str_repeat('X', strlen(SURFBAR_GET_RELOAD_TIME($nextId)))
                        );
 

diff --git a/templates/de/html/surfbar/surfbar_frame_top.tpl b/templates/de/html/surfbar/surfbar_frame_top.tpl
index ce80817c02c3ba277eb053e213abdb3ba2a55676..5ac130021b34e130b0e667a60c7ab40544c66029 100644 (file)
--- a/templates/de/html/surfbar/surfbar_frame_top.tpl
+++ b/templates/de/html/surfbar/surfbar_frame_top.tpl
@@ -11,7 +11,7 @@
                </div>
 
                <div>
-               &raquo;<a href="$content[url]" target="_blank">Aktuelle Seite in neuem
+               &raquo;<a href="{%pipe,SURFBAR_GET_URL=$content[url_id]%}" target="_blank">Aktuelle Seite in neuem
                Fenster &ouml;ffnen</a>&laquo;
                <span id="surfbar_navi">[<a href="#" onclick="return startStopCounter();"
                 id="start">Anhalten</a>|<a target="_parent"
@@ -57,7 +57,7 @@ function init () {
 }
 
 function confirm () {
-       parent.surfbar_url.location="{%url=surfbar.php?id=$content[url_id]&check=$content[check]&salt=$content[salt]%}";
+       parent.surfbar_url.location="{%url=surfbar.php?id=$content[url_id]&check={%pipe,SURFBAR_GENERATE_VALIDATION_CODE=$content[url_id]%}&salt={%pipe,SURFBAR_GET_SALT%}%}";
 }
 
 function reloadSurfbar () {
@@ -66,11 +66,11 @@ function reloadSurfbar () {
 }
 
 function initCounter () {
-       parent.surfbar_url.location.href = '$content[url]';
-       counter.innerHTML = '$content[reload]';
-       points.innerHTML  = '$content[reward]';
-       reload.innerHTML  = '$content[curr_reload]';
-       max.innerHTML     = '$content[max_urls]';
+       parent.surfbar_url.location.href = '{%pipe,SURFBAR_GET_URL=$content[url_id]%}';
+       counter.innerHTML = '{%pipe,SURFBAR_GET_RELOAD_TIME=$content[url_id]%}';
+       points.innerHTML  = '{%pipe,SURFBAR_GET_REWARD,translateComma=$content[url_id]%}';
+       reload.innerHTML  = '{%pipe,SURFBAR_GET_USER_LOCKS%}';
+       max.innerHTML     = '{%pipe,SURFBAR_GET_TOTAL_URLS%}';
 }
 
 function startCounter () {