X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=60a9d02731580fa7ce22c4984e9801c76427e021;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hp=ce02418337b0e7d99224cbcc55491c696d03d8e3;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index ce02418337..60a9d02731 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -139,14 +139,14 @@ LIMIT 1",
 			list($adminId) = SQL_FETCHROW($result);
 
 			// Rewrite email address to contact link
-			$email = "{?URL?}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($adminId);
+			$email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($adminId) . '%}';
 		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} elseif ((is_int($email)) && ($email > 0)) {
 		// Direct id given
-		$email = "{?URL?}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
+		$email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($email) . '%}';
 	}
 
 	// Return rewritten (?) email address
@@ -399,12 +399,12 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
 
 // Sends out mail to all administrators
 // IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
-function sendAdminsEmails ($subj, $template, $content, $UID) {
+function sendAdminsEmails ($subj, $template, $content, $userid) {
 	// Trim template name
 	$template = trim($template);
 
 	// Load email template
-	$message = loadEmailTemplate($template, $content, $UID);
+	$message = loadEmailTemplate($template, $content, $userid);
 
 	// Check which admin shall receive this mail
 	$result = SQL_QUERY_ESC("SELECT `admin_id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `admin_id` ASC",
@@ -432,13 +432,13 @@ function sendAdminsEmails ($subj, $template, $content, $UID) {
 		if ($adminId == '-1') {
 			if (isExtensionActive('events')) {
 				// Add line to user events
-				EVENTS_ADD_LINE($subj, $message, $UID);
+				EVENTS_ADD_LINE($subj, $message, $userid);
 			} else {
 				// Log error for debug
-				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
+				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,userid=%s",
 					$template,
 					$subj,
-					$UID
+					$userid
 				));
 			}
 		} elseif ($adminId == '0') {