X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_sponsor.php;h=86e4cdba73a176554459f1a444ddf475976af393;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=b4af6fa752d56d8d8682c5f2e4966585792c1428;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index b4af6fa752..86e4cdba73 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -14,8 +14,6 @@
  * $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, 2010 by Mailer Developer Team                    *
@@ -48,7 +46,7 @@ addMenuDescription('admin', __FILE__);
 // Check if admin has submitted form
 if (isFormSent()) {
 	// Does he have selected at least one sponsor?
-	if (countSelection(postRequestParameter('id')) > 0) {
+	if (ifPostContainsSelections('id')) {
 		// At least one entry selected
 		foreach (postRequestParameter('id') as $id => $selected) {
 			// Secure id number and init $content
@@ -59,35 +57,41 @@ if (isFormSent()) {
 
 			// Load his personal data
 			$result_main = SQL_QUERY_ESC("SELECT
-	`gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`, `points_amount`, `refid`
+	`id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+	UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+	`points_amount`, `points_used`,
+	(`points_amount` + `points_used`) AS `points`,
+	`refid`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-	`status`='PENDING' AND
+	`status` IN('PENDING','UNCONFIRMED') AND
 	`id`=%s
 LIMIT 1",
 			array($content['id']), __FILE__, __LINE__);
 
+			/// Is there an entry?
 			if (SQL_NUMROWS($result_main) == 1) {
 				// Load data
 				$content = SQL_FETCHARRAY($result_main);
 
 				// Check for open payments and close them
 				$result = SQL_QUERY_ESC("SELECT
-	so.admin_id, so.pay_count, so.pay_ordered, so.pay_status,
-	sp.pay_name, sp.pay_rate, sp.pay_currency
+	so.admin_id, so.pay_count,
+	UNIX_TIMESTAMP(so.pay_ordered) AS `pay_ordered`,
+	so.pay_status, sp.pay_name, sp.pay_rate, sp.pay_currency
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_orders` AS so
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_sponsor_paytypes` AS sp
 ON
-	sp.id=so.payid
+	sp.id=so.payment_id
 WHERE
-	so.sponsorid='%s'
+	so.sponsor_id=%s
 ORDER BY
 	sp.pay_name ASC",
 					array($content['id']), __FILE__, __LINE__);
-				if (SQL_NUMROWS($result) > 0) {
+				if (!SQL_HASZERONUMS($result)) {
 					// Payment does exist
 					while ($content2 = SQL_FETCHARRAY($result)) {
 						// Merge both arrays
@@ -118,6 +122,10 @@ ORDER BY
 
 				// Free memory
 				SQL_FREERESULT($result);
+			} else {
+				// Not found
+				loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_ACCOUNT_404_ALREADY_CONFIRMED', $content['id']));
+				return;
 			}
 
 			// Free memory
@@ -130,7 +138,7 @@ SET
 	`status`='CONFIRMED'
 WHERE
 	`id`=%s AND
-	`status`='PENDING'
+	`status` IN('PENDING','UNCONFIRMED')
 LIMIT 1",
 			array($content['id']), __FILE__, __LINE__);
 
@@ -164,8 +172,8 @@ LIMIT 1",
 					// Send warnings out?
 					if ($REFERAL['receive_warnings'] == 'Y') {
 						// Send notification to referal
-						$REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
-						sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
+						$REFERAL_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
+						sendEmail($REFERAL['email'], '{--SPONSOR_REFERAL_NOTIFY_SUBJECT--}', $REFERAL_MSG);
 					} // END - if
 
 					// Free memory
@@ -173,12 +181,9 @@ LIMIT 1",
 				} // END - if
 			} // END - if
 
-			// Transfer data to array
-			$content['points']   = translateComma($content['points_amount']);
-
 			// So let's send the email away
 			$message = loadEmailTemplate('sponsor_unlocked', $content);
-			sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $message);
+			sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message);
 		} // END - foreach
 	} else {
 		// Nothing selected
@@ -188,33 +193,24 @@ LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT
-	`id`, `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`
+	`id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+	UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
 FROM
 	`{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-	`status`='PENDING'
+	`status` IN('PENDING','UNCONFIRMED')
 ORDER BY
 	`id`", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Entries found so let's list them!
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
-		// Transfer data to array
-		$content = array(
-			'sw'              => $SW,
-			'id'              => $content['id'],
-			'gender'          => $content['gender'],
-			'surname'         => $content['surname'],
-			'family'          => $content['family'],
-			'email'           => generateEmailLink($content['email'], 'sponsor_data'),
-			'remote_addr'     => $content['remote_addr'],
-			'sponsor_created' => generateDateTime($content['sponsor_created'], 2),
-		);
+		// Translate some data
+		$content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
 
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_unlock_sponsor_row', true, $content);
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Load template