X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=birthday_confirm.php;h=818001a631e5da1fc2fdfeca24c7a6e2a53c2d13;hb=3a14ba882ed6a077efb6aaa4f5e6bcc8feac20a5;hp=11b24eee014c0b6fb583c62edef108bc1d9729eb;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 11b24eee01..818001a631 100644
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -63,18 +63,23 @@ $userid = bigintval(getRequestParameter('userid'));
 $chk = bigintval(getRequestParameter('check'), false);
 
 // Check if link is not clicked so far
-$result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
+$result = SQL_QUERY_ESC("SELECT
+	b.`points`, d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`status`, d.`ref_payout`
 FROM
 	`{?_MYSQL_PREFIX?}_user_birthday` AS b
 INNER JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-	b.userid=d.userid
+	b.`userid`=d.`userid`
 WHERE
-	b.userid=%s AND b.chk_value='%s'
+	b.`userid`=%s AND
+	b.`chk_value`='%s'
 LIMIT 1",
-	array($userid, $chk), __FILE__, __LINE__);
-//* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result).")<br />");
+	array(
+		$userid,
+		$chk
+	), __FILE__, __LINE__);
+//* DEBUG: */ debugOutput("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result) . ')');
 
 // Prepare content
 $content = array();
@@ -86,32 +91,24 @@ if (SQL_NUMROWS($result) == 1) {
 
 	// Is the account confirmed?
 	if ($data['status'] == 'CONFIRMED') {
-		// Set mode depending on how many mails the member has to confirm
-		$locked = false;
-		if (($data['ref_payout'] > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
-
 		// Add points to account
 		// @TODO Try to rewrite the following unset()
 		unset($GLOBALS['ref_level']);
-		addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points'], false, 0, $locked, strtolower(getConfig('birthday_mode')));
+		addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points'], false, 0, strtolower(getConfig('birthday_mode')));
 
 		// Remove entry from table
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",
 			array($userid, $chk), __FILE__, __LINE__);
 
-		// "Translate" some data
-		$data['gender'] = translateGender($data['gender']);
-		$data['points'] = translateComma($data['points']);
-
 		// Load message from template
 		$content['message'] = loadTemplate('birthday_msg', true, $data);
 	} else {
 		// Unconfirmed / locked accounts cannot get points
-		$content['message'] = getMaskedMessage('BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
+		$content['message'] = getMaskedMessage('MEMBER_BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
 	}
 } else {
 	// Cannot load data!
-	$content['message'] = getMessage('BIRTHDAY_CANNOT_LOAD_DATA');
+	$content['message'] = '{--MEMBER_BIRTHDAY_CANNOT_LOAD_DATA--}';
 }
 
 // Free memory