X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=birthday_confirm.php;h=f95f1f144b2fd9dfad305ae48e0dc2f730d6e30d;hp=c228c94a1379db3b2e856fcc28758a19a141829f;hb=588b84a642e12330ec299600a73be309da297068;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/birthday_confirm.php b/birthday_confirm.php
index c228c94a13..f95f1f144b 100644
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -8,16 +8,15 @@
  * -------------------------------------------------------------------- *
  * Short description : Birthday bonus confirmation link                 *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Geburtstagsgutschrift bestätigen                *
+ * Kurzbeschreibung  : Geburtstagsgutschrift bestaetigen                *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $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                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -62,18 +61,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();
@@ -85,32 +89,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