X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fsponsor%2Fsettings.php;h=cee56805ac8464803531cf8fd26ef741e74e81a4;hp=f49a345912321f9c8795c58b7f23422c7f7befe8;hb=305ad0593fb7abd5051045615c5cc5f00fecd823;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index f49a345912..cee56805ac 100644
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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,11 +39,11 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isExtensionActive('sponsor')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
@@ -54,7 +52,7 @@ $message = '';
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT
-	`status`, `receive_warnings`, `warning_interval`, `email`, `surname`, `family`, `gender`
+	`status`,`receive_warnings`,`warning_interval`,`email`,`surname`,`family`,`gender`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -62,7 +60,7 @@ WHERE
 	`password`='%s'
 LIMIT 1",
 	array(
-		bigintval(getSession('sponsorid')),
+		bigintval(getSession('sponsor_id')),
 		getSession('sponsorpass')
 	), __FILE__, __LINE__);
 
@@ -78,7 +76,7 @@ if (SQL_NUMROWS($result) == 1) {
 				$message = SPONSOR_NO_CURRENT_PASSWORD_ENTERED;
 			} elseif (md5(postRequestParameter('password')) != getSession('sponsorpass')) {
 				// Entered password didn't match password in DB
-				$message = SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB;
+				$message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
 			} else {
 				// Unsecure data which we don't want here
 				$UNSAFE = array(
@@ -101,10 +99,10 @@ if (SQL_NUMROWS($result) == 1) {
 
 			if (!empty($message)) {
 				// Output message
-				$OUT = loadTemplate('admin_settings_saved', true, $message);
+				$GLOBALS['sponsor_output'] = displayMessage($message, true);
 			} else {
 				// No message generated
-				$OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+				$GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
 			}
 		} else {
 			// Make yes/no selection
@@ -113,16 +111,15 @@ if (SQL_NUMROWS($result) == 1) {
 			$content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
 			// Output formular
-			$OUT = loadTemplate('sponsor_settings_form', true, $content);
+			$GLOBALS['sponsor_output'] = loadTemplate('sponsor_settings_form', true, $content);
 		}
 	} else {
 		// Locked or so?
-		$STATUS = sponsorTranslateUserStatus($content['status']);
-		$OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+		$GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
 	}
 } else {
-	// Sponsor account not found!
-	$OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsorid')));
+	// Sponsor account not found
+	$GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
 }
 
 // Free memory