X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=0110dfec0235d9d7abf867882033ebeb7b02bed3;hb=03486c08011d4c233e2455c8e5335ecc0818333f;hp=21b69096609240c668cc925b14f16661db97c93a;hpb=682edce003a1a91f66fb8e2212d7fdb591379843;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 21b6909660..0110dfec02 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('order')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
 	return;
 } // END - if
 
@@ -61,7 +61,7 @@ $total = getTotalPoints(getMemberId());
 
 if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
 	// Holiday is active!
-	loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
+	displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
 	// Continue with the frametester, we first need to store the data temporary in the pool
 	//
@@ -95,7 +95,7 @@ LIMIT 1",
 		if (getConfig('allow_url_in_text') == 'Y') {
 			// Test submitted text against some filters (length, URLs in text etc.)
 			if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
-				// URL found!
+				// URL found
 				$url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
 			} // END - if
 
@@ -120,7 +120,7 @@ LIMIT 1",
 		} // END - if
 
 		// And shall I check that his URL is not in the black list?
-		if (isUrlBlaskEnabled()) {
+		if (isUrlBlacklistEnabled()) {
 			// Ok, I do that for you know...
 			$result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
 				array(postRequestParameter('url')), __FILE__, __LINE__);
@@ -397,7 +397,7 @@ LIMIT 1",
 	$url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
 	// No more mail orders allowed
-	loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
+	displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
 } elseif ($links < getConfig('unconfirmed')) {
 	// Show only enabled categories to the user ...
 	$whereStatement = " WHERE `visible`='Y'";
@@ -514,7 +514,7 @@ LIMIT 1",
 
 				if (!empty($message)) {
 					// We got system message so we drop it out to the user
-					loadTemplate('admin_settings_saved', false, $message);
+					displayMessage($message);
 				} // END - if
 
 				// Load all email types...
@@ -659,19 +659,19 @@ LIMIT 1",
 				}
 			} else {
 				// No mail types defined
-				loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_PAYMENTS--}</span>');
+				displayMessage('<span class="notice">{--MEMBER_NO_PAYMENTS--}</span>');
 			}
 		} else {
 			// No points left
-			loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_POINTS--}</span>');
+			displayMessage('<span class="notice">{--MEMBER_NO_POINTS--}</span>');
 		}
 	} else {
 		// No cateogries are defined yet
-		loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
+		displayMessage('<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
 	}
 } else {
 	// Please confirm some mails first
-	loadTemplate('admin_settings_saved', false, '<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
+	displayMessage('<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
 }
 
 if (!empty($url)) {