From c563d3af1f2a852ff0dd3a8ccd477136bed6c661 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 23 Aug 2010 13:33:47 +0000
Subject: [PATCH] Rewritten to make usage of encapsulated API functions

---
 inc/functions.php                             | 2 +-
 inc/language/de.php                           | 1 +
 inc/modules/admin/admin-inc.php               | 2 +-
 inc/modules/admin/what-list_beg.php           | 2 +-
 inc/modules/admin/what-list_bonus.php         | 2 +-
 inc/modules/admin/what-list_notifications.php | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index ff063d75f7..f44633a7c4 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1480,7 +1480,7 @@ function getMessageFromErrorCode ($code) {
 			if (isExtensionActive('mailid', true)) {
 				$message = '{--ERROR_CONFIRMING_MAIL--}';
 			} else {
-				$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
+				$message = generateExtensionInactiveNotInstalledMessage('mailid');
 			}
 			break;
 
diff --git a/inc/language/de.php b/inc/language/de.php
index 5942f2decc..ffc111ab18 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -998,6 +998,7 @@ addMessages(array(
 	'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">%s {?POINTS?}</span> geschrettert.",
 	'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
 	'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+	'ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED' => "Erweiterung <span class=\"data\">%s</span> nicht installiert..",
 	'EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert.",
 	'EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert.",
 	'EXTENSION_PROBLEM_UNSET_EXT' => "Skriptfehler: Parameter <strong>ext</strong> nicht gesetzt.",
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 3039bd9e07..04f16c2dc2 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1271,7 +1271,7 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
+				$adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
 			}
 		} else {
 			// Maybe deleted?
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 225bac8125..1a2b8fefa2 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -122,7 +122,7 @@ ORDER BY
 		if (isExtensionActive('autopurge')) {
 			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
 		} else {
-			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge'));
+			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, generateExtensionInactiveNotInstalledMessage('autopurge'));
 		}
 
 		// Load final template
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 78eea1eb80..029b357bf7 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -135,7 +135,7 @@ ORDER BY
 		if (isExtensionActive('autopurge')) {
 			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
 		} else {
-			$content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge');
+			$content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
 		}
 
 		// Load final template
diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index a5283734b9..8985288b32 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -69,7 +69,7 @@ ORDER BY
 	$result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
 } else {
 	// Bonus extension required!
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'bonus'));
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
 }
 
 // Create limitation line
-- 
2.39.5