X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admins_contct.php;h=a84cdcdd4c780f723dd11ddd6f7f2399ccbc1159;hb=e51f09bb54eaaf565ac1bae162bf363fc9553ff7;hp=ef8283a88a76a1ab2a0f37064c417944e0a0c0cf;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index ef8283a88a..a84cdcdd4c 100644
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -45,38 +45,24 @@ addYouAreHereLink('admin', __FILE__);
 
 if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
 	// Send mail or message
-	if ((isExtensionActive('msg')) && (postRequestParameter('type') == 'message')) {
-		// Add message
-		$message = loadEmailTemplate('admins_msg_contct_admin', postRequestParameter('text'), 0);
-		sendAdminMessage(getRequestParameter('admin'), '{--ADMINS_MSG_FROM_ADMIN--}', $message);
-	} else {
-		// Load admin's email address
-		$email = getAdminEmail(bigintval(getRequestParameter('admin')));
+	// Load admin's email address
+	$email = getAdminEmail(bigintval(getRequestParameter('admin')));
 
-		// Load email template and send the mail to the admin
-		$message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
-		sendEmail($email, '{--ADMINS_MSG_FROM_ADMIN--}', $message);
-	}
+	// Load email template and send the mail to the admin
+	$message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
+	sendEmail($email, '{--ADMIN_ADMINS_MESSAGE_FROM_ADMIN--}', $message);
 
 	// Mail / message dropped
-	loadTemplate('admin_settings_saved', false, '{--ADMINS_ADMIN_CONTACTED--}');
+	displayMessage('{--ADMIN_ADMINS_ADMIN_CONTACTED--}');
 } elseif (isGetRequestParameterSet('admin')) {
 	// Load contact form template
 	$content['admin'] = getRequestParameter('admin');
 
-	if (isExtensionActive('msg')) {
-		// Add option to select between mail and message
-		$content['message_selection'] = loadTemplate('admin_admins_contct_select', true);
-	} else {
-		// Outout hidden input
-		$content['message_selection'] = loadTemplate('admin_admins_contct_default', true);
-	}
-
 	// Load main form
 	loadTemplate('admin_admins_contct_form', false, $content);
 } else {
 	// Please select an admin!
-	loadTemplate('admin_settings_saved', false, '{--ADMINS_SELECT_ADMIN--}');
+	displayMessage('{--ADMIN_ADMINS_SELECT_ADMIN--}');
 }
 
 // [EOF]