X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_bonus.php;h=b1521d481804d8d61ce2751d94fff02acacff2f7;hb=e88e30c24737cf641f2e93f6a311e641ccbf5960;hp=6cc0db906eada15d923d2cc1f4349b4bfe04baae;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 6cc0db906e..b1521d4818 100644
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,37 +41,43 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('order')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
 	return;
 } // END - if
 
-// Set empty mode to "select"
-if (!isGetRequestParameterSet('mode')) setGetRequestParameter('mode', "select");
+// mail_mode is not set by default
+if (!isGetRequestElementSet('mail_mode')) {
+	// Is HTML extension enabled?
+	if (isExtensionInstalled('html_mail')) {
+		// Set empty mode to 'select'
+		setGetRequestElement('mail_mode', 'select');
+	} else {
+		// Set empty mode to 'normal'
+		setGetRequestElement('mail_mode', 'normal');
+	}
+} // END - if
 
 if (isFormSent()) {
 	// Deliver bonus mail
-	addNewBonusMail(postRequestArray(), getRequestParameter('mode'));
+	addNewBonusMail(postRequestArray(), getRequestElement('mail_mode'));
 } else {
-	// Get all available users
-	$content['all'] = translateComma(getTotalReceivers(getRequestParameter('mode')));
-
-	// Prepare option lines
-	$content['options_lines'] = generateCategoryOptionsList(getRequestParameter('mode'));
-
 	// Store send mode
-	$content['mode'] = getRequestParameter('mode');
+	$content['mail_mode'] = getRequestElement('mail_mode');
 
 	$content['html_select'] = '';
 	if (isExtensionActive('html_mail')) {
 		// If HTML extension is active
-		$content['html_select'] = loadTemplate('admin_send_bonus_html', true);
+		$content['html_select'] = loadTemplate('admin_send_bonus_html', TRUE);
 	} // END - if
 
+	// Default template name is an invalid one
+	$template = 'admin_send_bonus_invalid';
+
 	// Select template
-	switch(getRequestParameter('mode')) {
+	switch(getRequestElement('mail_mode')) {
 		case 'html':   // HTML mails
 		case 'normal': // Normal mails
 			$template = 'admin_send_bonus_form';
@@ -81,10 +86,10 @@ if (isFormSent()) {
 		case 'select': // Selection
 			$template = 'admin_send_bonus_select';
 			break;
-	} // END - if
+	} // END - switch
 
 	// Load template
-	loadTemplate($template, false, $content);
+	loadTemplate($template, FALSE, $content);
 }
 
 // [EOF]