From 498f14a6cae9f79913b07da2778c68b57b7dcdef Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 9 Nov 2009 16:59:04 +0000
Subject: [PATCH] Some old lost language constants fixed

---
 inc/libs/surfbar_functions.php                    | 10 ++--------
 inc/modules/admin/what-list_surfbar_actions.php   |  8 ++++----
 templates/de/html/admin/admin_add_surfbar_url.tpl | 12 ++++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 09bbe89931..278ad21d4a 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -737,14 +737,8 @@ function translateSurfbarUrlStatus ($status) {
 	// Create constant name
 	$constantName = sprintf("SURFBAR_URL_STATUS_%s", strtoupper($status));
 
-	// Set default translated status
-	$statusTranslated = '!'.$constantName.'!';
-
-	// Is the constant there?
-	if (defined($constantName)) {
-		// Then get it's value
-		$statusTranslated = constant($constantName);
-	} // END - if
+	// Get message
+	$statusTranslated = getMessage($constantName);
 
 	// Return result
 	return $statusTranslated;
diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 184ac2a9b2..d262671aff 100644
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -59,16 +59,16 @@ if (SQL_NUMROWS($result) > 0) {
 	$OUT = ''; $SW = 2;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// "Translate" some data
-		$content['status']     = constant(sprintf("SURFBAR_URL_STATUS_%s", $content['status']));
-		$content['action']     = constant(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['action']));
+		$content['status']     = translateSurfbarUrlStatus($content['status']);
+		$content['action']     = getMessage(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['action']));
 
 		// New status set?
 		if (!is_null($content['new_status'])) {
 			// Translate it
-			$content['new_status'] = constant(sprintf("SURFBAR_URL_STATUS_%s", $content['new_status']));
+			$content['new_status'] = translateSurfbarUrlStatus($content['new_status']);
 		} else {
 			// "Do nothing" status
-			$content['new_status'] = SURFBAR_URL_STATUS_NONE;
+			$content['new_status'] = getMessage('SURFBAR_URL_STATUS_NONE');
 		}
 
 		// Add color
diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl
index 8c6ef2bc70..34a473147a 100644
--- a/templates/de/html/admin/admin_add_surfbar_url.tpl
+++ b/templates/de/html/admin/admin_add_surfbar_url.tpl
@@ -1,25 +1,25 @@
 <div align="center">
 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_surfbar_url" method="post">
-<div class="admin_table dashed" style="width:600px;margin-top:10px;">
-	<div class="admin_title bottom2" style="padding-top:5px;padding-bottom:5px;">
+<div class="admin_table dashed">
+	<div class="admin_title bottom2">
 		<strong>URL in Surfbar hinzuf&uuml;gen:</strong>
 	</div>
 
-	<div class="admin_input" style="padding-top:5px;padding-bottom:5px;" align="center">
+	<div class="admin_input" align="center">
 		URL eingeben: <input type="text" name="url" size="20" maxlength="255" value="http://" />
 	</div>
 
-	<div class="admin_input" style="padding-top:5px;padding-bottom:5px;" align="center">
+	<div class="admin_input" align="center">
 		Maximale Einblendung: <input type="text" name="limit" size="5" maxlength="20" value="0" /><br />
 		<span class="admin_note">(0 = Unbegrenzt)</span>
 	</div>
 
-	<div class="admin_input" style="padding-top:5px;padding-bottom:5px;" align="center">
+	<div class="admin_input" align="center">
 		Reloadsperre: $content[reload]
 		<span class="admin_note">(0 = Standarteinstellungen)</span>
 	</div>
 
-	<div align="center" class="footer top2" style="padding-top:3px;padding-bottom:3px;">
+	<div align="center" class="admin_footer top2">
 		<input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
 		<input type="submit" class="admin_submit" name="add" value="{--ADMIN_SURFBAR_ADD_URL--}" />
 	</div>
-- 
2.30.2