X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=1716bf3549da10bc1ca53b6609be36581742f719;hb=101e5f161c0c367c022c9288398226a57f3919d7;hp=c97eac07a05d8e7df43ba1676e7b76c7be0ca7ec;hpb=e2ec4cbde50b9b2a568b16d72eb383500ff8a17c;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index c97eac07a0..1716bf3549 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -296,7 +296,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '%}">';
+					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
 				}
 
 				$OUT .= $title;
@@ -359,7 +359,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
+								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -762,7 +762,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 	} // END - if
 
 	// Is the raw userid set?
-	if (postRequestParameter($userid, $id) > 0) {
+	if (postRequestParameter($useridColumn, $id) > 0) {
 		// Load email template
 		if (!empty($subjectPart)) {
 			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
@@ -771,7 +771,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
+		sendEmail(postRequestParameter($useridColumn, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
 	} // END - if
 
 	// Generate subject
@@ -779,9 +779,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($useridColumn, $id));
 	} else {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($useridColumn, $id));
 	}
 }
 
@@ -1295,11 +1295,11 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+				$adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
 			}
 		} else {
 			// Maybe deleted?
-			$adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+			$adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
 		}
 	} // END - if
 
@@ -1500,7 +1500,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
 			default: // Unexpected action
 				logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-				displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+				displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
 				break;
 		} // END - switch
 	} // END - foreach