From 740ebc7e0fa047159dc57a3a4bf7365c69ad9e17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 19 Jun 2010 23:56:43 +0000
Subject: [PATCH] More rewrites to make use of the EL

---
 surfbar.php                                     |  7 -------
 templates/de/html/surfbar/surfbar_frame_top.tpl | 14 +++++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/surfbar.php b/surfbar.php
index e835e927dd..d659861935 100644
--- 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 ce80817c02..5ac130021b 100644
--- 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 () {
-- 
2.30.2