From: Roland Häder <roland@mxchange.org>
Date: Sun, 21 Oct 2012 19:34:58 +0000 (+0000)
Subject: The usual asset of bugfixes for ext-surfbar
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dffad9e811f8728d2672630a009fe2f8736c3837;p=mailer.git

The usual asset of bugfixes for ext-surfbar
---

diff --git a/inc/js/js-surfbar_frame_top.php b/inc/js/js-surfbar_frame_top.php
index 0ad7344277..dbe4ce7a68 100644
--- a/inc/js/js-surfbar_frame_top.php
+++ b/inc/js/js-surfbar_frame_top.php
@@ -54,8 +54,8 @@ isSurfbarReloadFull();
 // Prepare content
 $content = array(
 	'url_id' => bigintval(getRequestElement('url_id')),
-	'check'  => generateSurfbarValidationCode(getRequestElement('url_id'), gerSurfbarLastSalt()),
-	'salt'   => gerSurfbarLastSalt(),
+	'check'  => generateSurfbarValidationCode(getRequestElement('url_id'), getSurfbarLastSalt()),
+	'salt'   => getSurfbarLastSalt(),
 );
 
 // Load template
diff --git a/inc/js/js-surfbar_member_edit.php b/inc/js/js-surfbar_member_edit.php
index 21b366e891..e91462721b 100644
--- a/inc/js/js-surfbar_member_edit.php
+++ b/inc/js/js-surfbar_member_edit.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 
 // Prepare content
 $content = array(
-	'views_max' => bigintval(getRequestElement('views_max')),
-	'limited'   => bigintval(getRequestElement('limited'))
+	'url_views_max' => getRequestElement('url_views_max'),
+	'limited'       => getRequestElement('limited')
 );
 
 // Simply load the JavaScript here
diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index 480875f754..4d7055e026 100644
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -159,6 +159,7 @@ addMessages(array(
 	'MEMBER_SURFBAR_ACTION_DONE' => "Ausgew&auml;hlte Aktion ausgef&uuml;hrt.",
 	'MEMBER_SURFBAR_ACTION_FAILED' => "Ausgew&auml;hlte Aktion konnte nicht vollst&auml;ndig ausgef&uuml;hrt werden.",
 	'MEMBER_SURFBAR_UNLIMITED_VIEWS' => "Unbegrenzt",
+	'MEMBER_SURFBAR_TEST_URL' => "URL-Tester",
 
 	// Subject lines for admins
 	'ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT' => "[Surfbar:] URL hinzugef&uuml;gt durch Admin",
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 51c881a7e6..7a0760d405 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -259,8 +259,12 @@ function doSurfbarMemberByFormData ($formData, $urlArray) {
 
 	// Is the function there?
 	if (function_exists($functionName)) {
+		// Load data and add it to globals array
+		$urlData = getSurfbarUrlData($formData['url_id']);
+		$GLOBALS['surfbar_cache'] = merge_array($GLOBALS['surfbar_cache'], $urlData[$formData['url_id']]);
+
 		// Add new status
-		$urlArray[$formData['url_id']]['new_status'] = gerSurfbarNewStatus('new_status');
+		$urlArray[$formData['url_id']]['new_status'] = getSurfbarNewStatus('new_status');
 
 		// Extract URL data for call-back
 		$urlData = array(merge_array($urlArray[$formData['url_id']], array($action => $formData)));
@@ -392,7 +396,7 @@ function doSurfbarMemberUnpauseAction ($urlData) {
 	// Fix missing entry for template
 	$urlData['edit'] = $urlData['unpause'];
 	$urlData['edit']['url'] = $urlData['url'];
-	$urlData['edit']['limit'] = gerSurfbarViewsMax();
+	$urlData['edit']['limit'] = getSurfbarViewsMax();
 
 	// Return status change
 	return changeSurfbarUrlStatus($urlData['url_id'], $urlData['url_status'], $urlData['new_status'], array($urlData['url_id'] => $urlData));
@@ -406,7 +410,7 @@ function doSurfbarMemberResubmitAction ($urlData) {
 // Display selected "action form"
 function displaySurfbarMemberActionForm ($action, $urlData) {
 	// Translate some data if present
-	$content = prepareSurfbarContentForTemplate($content);
+	$content = prepareSurfbarContentForTemplate($urlData);
 
 	// Include fields only for action 'edit'
 	if ($action == 'edit') {
@@ -416,7 +420,7 @@ function displaySurfbarMemberActionForm ($action, $urlData) {
 		$urlData['limited']     = 'false';
 
 		// Is this URL limited?
-		if (gerSurfbarViewsMax() > 0) {
+		if (getSurfbarViewsMax() > 0) {
 			// Then rewrite form data
 			$urlData['limited_yes'] = ' checked="checked"';
 			$urlData['limited_no']  = '';
@@ -478,7 +482,7 @@ SET
 	`url_views_max`=%s
 WHERE
 	`url_id`=%s AND
-	`status`='%s'
+	`url_status`='%s'
 LIMIT 1",
 			array(
 				$urlData['url'],
@@ -948,7 +952,7 @@ ON
 	u.`url_id`=l.`locks_url_id`
 WHERE
 	l.`locks_userid`=%s AND
-	(UNIX_TIMESTAMP() - {%%pipe,gerSurfbarSurfLock%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
+	(UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
 	(
 		((UNIX_TIMESTAMP(l.`locks_last_surfed`) - u.`url_fixed_reload`) < 0 AND u.`url_fixed_reload` > 0) OR
 		u.`url_fixed_reload` = 0
@@ -1071,15 +1075,15 @@ function generateSurfbarValidationCode ($urlId, $salt = '') {
 	if (empty($salt)) {
 		 // Generate random hashed string
 		$GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255)));
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.gerSurfbarSalt().'', FALSE);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.getSurfbarSalt().'', FALSE);
 	} else {
 		// Use this as salt!
 		$GLOBALS['surfbar_cache']['salt'] = $salt;
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.gerSurfbarSalt().'', FALSE);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.getSurfbarSalt().'', FALSE);
 	}
 
 	// Hash it with md5() and salt it with the random string
-	$hashedCode = generateHash(md5($urlId . getEncryptSeparator() . getMemberId()), gerSurfbarSalt());
+	$hashedCode = generateHash(md5($urlId . getEncryptSeparator() . getMemberId()), getSurfbarSalt());
 
 	// Finally encrypt it PGP-like and return it
 	$valHashedCode = encodeHashForCookie($hashedCode);
@@ -1132,19 +1136,19 @@ function addSurfbarReloadLockById ($urlId) {
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function doSurfbarPayPoints () {
 	// Remove it from the URL owner
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.gerSurfbarUserid().',costs='.gerSurfbarCosts() . ' - ENTERED!');
-	if (isValidUserId(gerSurfbarUserid())) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - ENTERED!');
+	if (isValidUserId(getSurfbarUserid())) {
 		// Subtract points and ignore return status
-		subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), gerSurfbarUserid(), gerSurfbarCosts());
+		subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), getSurfbarUserid(), getSurfbarCosts());
 	} // END - if
 
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.gerSurfbarReward());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.getSurfbarReward());
 	// Init referral system here
 	initReferralSystem();
 
 	// Book it to the user and ignore return status
-	addPointsThroughReferralSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), gerSurfbarReward());
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.gerSurfbarUserid().',costs='.gerSurfbarCosts() . ' - EXIT!');
+	addPointsThroughReferralSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), getSurfbarReward());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - EXIT!');
 }
 
 // Updates the statistics of current URL/userid
@@ -1153,7 +1157,7 @@ function updateInsertSurfbarStatisticsRecord () {
 	$add = '';
 
 	// Get allowed views
-	$allowed = gerSurfbarViewsAllowed();
+	$allowed = getSurfbarViewsAllowed();
 
 	// Is there a limit?
 	if ($allowed > 0) {
@@ -1163,13 +1167,13 @@ function updateInsertSurfbarStatisticsRecord () {
 
 	// Update URL stats
 	SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_views_total`=`url_views_total`+1' . $add . ' WHERE `url_id`=%s LIMIT 1',
-		array(gerSurfbarId()), __FUNCTION__, __LINE__);
+		array(getSurfbarId()), __FUNCTION__, __LINE__);
 
 	// Update the stats entry
 	SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_surfbar_stats` SET `stats_count`=`stats_count`+1 WHERE `stats_userid`=%s AND `stats_url_id`=%s LIMIT 1',
 		array(
 			getMemberId(),
-			gerSurfbarId()
+			getSurfbarId()
 		), __FUNCTION__, __LINE__);
 
 	// Was that update okay?
@@ -1178,7 +1182,7 @@ function updateInsertSurfbarStatisticsRecord () {
 		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)',
 			array(
 				getMemberId(),
-				gerSurfbarId()
+				getSurfbarId()
 			), __FUNCTION__, __LINE__);
 	} // END - if
 
@@ -1195,12 +1199,12 @@ function updateInsertSurfbarStatisticsRecord () {
 // Update the salt for validation and statistics
 function updateSurfbarSaltStatistics () {
 	// Update salt
-	generateSurfbarValidationCode(gerSurfbarId());
+	generateSurfbarValidationCode(getSurfbarId());
 
 	// Make sure only valid salts can pass
-	if (gerSurfbarSalt() == 'INVALID') {
+	if (getSurfbarSalt() == 'INVALID') {
 		// Invalid provided
-		reportBug(__FUNCTION__, __LINE__, 'Invalid salt provided, id=' . gerSurfbarId() . ',getMemberId()=' . getMemberId());
+		reportBug(__FUNCTION__, __LINE__, 'Invalid salt provided, id=' . getSurfbarId() . ',getMemberId()=' . getMemberId());
 	} // END - if
 
 	// Update statistics record
@@ -1209,22 +1213,22 @@ function updateSurfbarSaltStatistics () {
 	// Simply store the salt from cache away in database...
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_salts` SET `salts_last_salt`='%s' WHERE `salts_url_id`=%s AND `salts_userid`=%s LIMIT 1",
 		array(
-			gerSurfbarSalt(),
-			gerSurfbarId(),
+			getSurfbarSalt(),
+			getSurfbarId(),
 			getMemberId()
 		), __FUNCTION__, __LINE__);
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt=' . gerSurfbarSalt() . ',id=' . gerSurfbarId() . ',userid=' . getMemberId() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - UPDATE!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt=' . getSurfbarSalt() . ',id=' . getSurfbarId() . ',userid=' . getMemberId() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - UPDATE!');
 
 	// Was that okay?
 	if (SQL_HASZEROAFFECTED()) {
 		// Insert missing entry!
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`, `salts_userid`, `salts_last_salt`) VALUES (%s, %s, '%s')",
 			array(
-				gerSurfbarId(),
+				getSurfbarId(),
 				getMemberId(),
-				gerSurfbarSalt()
+				getSurfbarSalt()
 			), __FUNCTION__, __LINE__);
 	} // END - if
 
@@ -1245,7 +1249,7 @@ FROM
 WHERE
 	`locks_userid`=%s AND
 	`locks_url_id`=%s AND
-	(UNIX_TIMESTAMP() - ".gerSurfbarSurfLock().") < UNIX_TIMESTAMP(`locks_last_surfed`)
+	(UNIX_TIMESTAMP() - ".getSurfbarSurfLock().") < UNIX_TIMESTAMP(`locks_last_surfed`)
 ORDER BY
 	`locks_last_surfed` ASC
 LIMIT 1",
@@ -1259,7 +1263,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Return check
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',count=' . $count . ',gerSurfbarSurfLock()=' . gerSurfbarSurfLock() . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',count=' . $count . ',getSurfbarSurfLock()=' . getSurfbarSurfLock() . ' - EXIT!');
 	return ($count == 1);
 }
 
@@ -1545,10 +1549,10 @@ ORDER BY
 	// Load all entries
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Debug message
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',rest='.(time() - $content['last_surfed']).'/'.gerSurfbarSurfLock());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',rest='.(time() - $content['last_surfed']).'/'.getSurfbarSurfLock());
 
 		// Skip entries that are too old
-		if (($content['last_surfed'] > (time() - gerSurfbarSurfLock())) && (!in_array($content['locks_url_id'], $ignored))) {
+		if (($content['last_surfed'] > (time() - getSurfbarSurfLock())) && (!in_array($content['locks_url_id'], $ignored))) {
 			// Debug message
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'okay - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
 
@@ -1737,7 +1741,7 @@ function determineSurfbarNextId ($urlId = NULL) {
 		} // END - if
 
 		// And query the database
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.gerSurfbarSurfLock());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.getSurfbarSurfLock());
 		$result = SQL_QUERY_ESC("SELECT
 	sbu.url_id,
 	sbu.url_userid,
@@ -1762,7 +1766,7 @@ WHERE
 	(sbu.`url_userid` NOT IN (".implode(',', $userids['url_userid']).") OR sbu.`url_userid` IS NULL) AND
 	sbu.url_status='ACTIVE' AND
 	(sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
-	".$add."
+	" . $add . "
 GROUP BY
 	sbu.`url_id`
 ORDER BY
@@ -1831,18 +1835,18 @@ LIMIT 1",
 		// Get base/fixed reward and costs
 		$GLOBALS['surfbar_cache']['reward'] = determineSurfbarReward();
 		$GLOBALS['surfbar_cache']['costs']  = determineSurfbarCosts();
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.gerSurfbarReward().'|costs='.gerSurfbarCosts());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
 
 		// Only in dynamic model add the dynamic bonus!
 		if (getSurfbarPaymentModel() == 'DYNAMIC') {
 			// Calculate dynamic reward/costs and add it
 			$GLOBALS['surfbar_cache']['reward'] += calculateSurfbarDynamicAddValue();
 			$GLOBALS['surfbar_cache']['costs']  += calculateSurfbarDynamicAddValue();
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.gerSurfbarReward().'|costs='.gerSurfbarCosts());
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
 		} // END - if
 
 		// Now get the id
-		$nextId = gerSurfbarId();
+		$nextId = getSurfbarId();
 	} // END - if
 
 	// Free result
@@ -2015,15 +2019,15 @@ function getSurfbarData ($element) {
 	$data = NULL;
 
 	// Is the entry there?
-	if ((isset($GLOBALS['surfbar_cache'][$element])) || (is_null($GLOBALS['surfbar_cache'][$element]))) {
-		// Then take it
-		$data = $GLOBALS['surfbar_cache'][$element];
-	} else { // END - if
+	if (!isset($GLOBALS['surfbar_cache'][$element])) {
 		print('surfbar_cache=<pre>');
 		print_r($GLOBALS['surfbar_cache']);
 		print('</pre>');
 		reportBug(__FUNCTION__, __LINE__, 'Element ' . $element . ' not found.');
-	}
+	} // END - if
+
+	// Then take it
+	$data = $GLOBALS['surfbar_cache'][$element];
 
 	// Return result
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data . ' - EXIT!');
@@ -2031,37 +2035,37 @@ function getSurfbarData ($element) {
 }
 
 // Getter for reward from cache
-function gerSurfbarReward () {
+function getSurfbarReward () {
 	// Get data element and return its contents
 	return getSurfbarData('reward');
 }
 
 // Getter for costs from cache
-function gerSurfbarCosts () {
+function getSurfbarCosts () {
 	// Get data element and return its contents
 	return getSurfbarData('costs');
 }
 
 // Getter for URL from cache
-function gerSurfbarUrl () {
+function getSurfbarUrl () {
 	// Get data element and return its contents
 	return getSurfbarData('url');
 }
 
 // Getter for salt from cache
-function gerSurfbarSalt () {
+function getSurfbarSalt () {
 	// Get data element and return its contents
 	return getSurfbarData('salt');
 }
 
 // Getter for id from cache
-function gerSurfbarId () {
+function getSurfbarId () {
 	// Get data element and return its contents
 	return getSurfbarData('url_id');
 }
 
 // Getter for userid from cache
-function gerSurfbarUserid () {
+function getSurfbarUserid () {
 	// Get data element and return its contents
 	return getSurfbarData('url_userid');
 }
@@ -2073,19 +2077,19 @@ function getSurfbarUserLocks () {
 }
 
 // Getter for reload time
-function gerSurfbarReloadTime () {
+function getSurfbarReloadTime () {
 	// Get data element and return its contents
 	return getSurfbarData('time');
 }
 
 // Getter for allowed views
-function gerSurfbarViewsAllowed () {
+function getSurfbarViewsAllowed () {
 	// Get data element and return its contents
 	return getSurfbarData('url_views_allowed');
 }
 
 // Getter for maximum views
-function gerSurfbarViewsMax () {
+function getSurfbarViewsMax () {
 	// Get data element and return its contents
 	return getSurfbarData('url_views_max');
 }
@@ -2097,19 +2101,19 @@ function getSurfbarFixedReload () {
 }
 
 // Getter for surf lock
-function gerSurfbarSurfLock () {
+function getSurfbarSurfLock () {
 	// Get data element and return its contents
 	return getSurfbarData('surf_lock');
 }
 
 // Getter for new status
-function gerSurfbarNewStatus () {
+function getSurfbarNewStatus () {
 	// Get data element and return its contents
 	return getSurfbarData('new_status');
 }
 
 // Getter for last salt
-function gerSurfbarLastSalt () {
+function getSurfbarLastSalt () {
 	// Get data element and return its contents
 	return getSurfbarData('salts_last_salt');
 }
diff --git a/surfbar.php b/surfbar.php
index cd6893f540..8efa7bb61a 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -188,7 +188,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 			// Then prepare other content
 			$content = array(
 				'url_id' => $nextId,
-				'xxx'    => str_repeat('X', strlen(gerSurfbarReloadTime($nextId))),
+				'xxx'    => str_repeat('X', strlen(getSurfbarReloadTime($nextId))),
 			);
 
 			// Update salt (double-call lock!) and statistics
diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl
index a493bff945..d8fa1043fb 100644
--- a/templates/de/emails/member/member_surfbar_low_points.tpl
+++ b/templates/de/emails/member/member_surfbar_low_points.tpl
@@ -1,6 +1,6 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von $content[low] {?POINTS?} gefallen wor&uuml;ber Sie informiert werden wollten. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen.
+Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von {%config,translateComma=surfbar_warn_low_points%} {?POINTS?} gefallen wor&uuml;ber Sie informiert werden wollten. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen.
 
 Hier sind alle Daten:
 ------------------------------------------
diff --git a/templates/de/html/js/js_surfbar_frame_top.tpl b/templates/de/html/js/js_surfbar_frame_top.tpl
index 9a1b5a0bef..f08dadb0f9 100644
--- a/templates/de/html/js/js_surfbar_frame_top.tpl
+++ b/templates/de/html/js/js_surfbar_frame_top.tpl
@@ -26,8 +26,8 @@
  * MA  02110-1301  USA
  */
 
-var currCounter = '{%pipe,gerSurfbarReloadTime=$content[url_id]%}';
-var maxCounter  = '{%pipe,gerSurfbarReloadTime=$content[url_id]%}';
+var currCounter = '{%pipe,getSurfbarReloadTime=$content[url_id]%}';
+var maxCounter  = '{%pipe,getSurfbarReloadTime=$content[url_id]%}';
 var counter     = document.getElementById('surfbar_counter');
 var points      = document.getElementById('surfbar_points');
 var reload      = document.getElementById('surfbar_reload');
@@ -76,14 +76,14 @@ function reloadSurfbar () {
 function initCounter () {
 	if (parent.surfbar_url != null) {
 		// Is in right frameset
-		parent.surfbar_url.location.href = '{%pipe,gerSurfbarUrl=$content[url_id]%}';
+		parent.surfbar_url.location.href = '{%pipe,getSurfbarUrl=$content[url_id]%}';
 	} else {
 		// Called frame=top directly
 		window.location.href = '{%url=surfbar.php%}';
 	}
 
-	counter.innerHTML = '{%pipe,gerSurfbarReloadTime=$content[url_id]%}';
-	points.innerHTML  = '{%pipe,gerSurfbarReward,translateComma=$content[url_id]%}';
+	counter.innerHTML = '{%pipe,getSurfbarReloadTime=$content[url_id]%}';
+	points.innerHTML  = '{%pipe,getSurfbarReward,translateComma=$content[url_id]%}';
 	reload.innerHTML  = '{%pipe,getSurfbarUserLocks%}';
 	max.innerHTML     = '{%pipe,getSurfbarTotalUrls%}';
 }
diff --git a/templates/de/html/js/js_surfbar_member_edit.tpl b/templates/de/html/js/js_surfbar_member_edit.tpl
index 9cab677d39..b36166e789 100644
--- a/templates/de/html/js/js_surfbar_member_edit.tpl
+++ b/templates/de/html/js/js_surfbar_member_edit.tpl
@@ -28,7 +28,7 @@
 
 var limit = document.getElementById('limit');
 var span = document.getElementById('span_limit');
-var old_limit = {%pipe,bigintval=$content[views_max]%};
+var old_limit = $content[url_views_max];
 
 function FocusLimitedNo () {
 	if ((limit.value > 0) && (limit.value != '-')) {
@@ -65,7 +65,7 @@ function ResetForm () {
 	return false;
 }
 
-if ({%pipe,bigintval=$content[limited]%} == true) {
+if ($content[limited] == true) {
 	FocusLimitedYes();
 } else {
 	FocusLimitedNo();
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 2bc8620dee..1188ce9c39 100644
--- a/templates/de/html/member/member_surfbar_edit_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl
@@ -16,7 +16,7 @@
 	</div>
 
 	<div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-		Aufrufe begrenzen auf: <input type="text" class="form_field" id="limit" name="limit" size="7" maxlength="20" value="$content[views_max]" />
+		Aufrufe begrenzen auf: <input type="text" class="form_field" id="limit" name="limit" size="7" maxlength="20" value="$content[url_views_max]" />
 	</div>
 
 	<div class="table_header top" style="padding-top:5px;padding-bottom:5px">
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_edit%}{%ext,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;url_views_max=$content[url_views_max]&amp;limited=$content[limited]"
  type="text/javascript"></script>
 </form>
 </div>
diff --git a/templates/de/html/surfbar/surfbar_frame_top.tpl b/templates/de/html/surfbar/surfbar_frame_top.tpl
index 9753b0cb5d..41b14020ad 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="{%pipe,gerSurfbarUrl=$content[url_id]%}" target="_blank">Aktuelle Seite in neuem
+			&raquo;<a href="{%pipe,getSurfbarUrl=$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">{--MEMBER_SURFBAR_ACTION_PAUSE_SUBMIT--}</a>|<a target="_parent"