X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Flibs%2Fearning_functions.php;h=345a06cd5386667752b94b456345b31fac7f7f09;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hp=809fda2563c617ad79a660d61af1799b6e33f0d5;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git

diff --git a/inc/libs/earning_functions.php b/inc/libs/earning_functions.php
index 809fda2563..345a06cd53 100644
--- a/inc/libs/earning_functions.php
+++ b/inc/libs/earning_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,18 +46,18 @@ function translateEarningGroup ($earningGroup) {
 }
 
 // Translates the "earning name" into human-readable
-function translateEarningName ($earningName) {
-	return sprintf("{--EARNING_NAME_%s--}", $earningName);
+function translateEarningProvider ($earningProvider) {
+	return sprintf("{--EARNING_PROVIDER_%s--}", $earningProvider);
 }
 
 /*
  * Generates a table (with templates) to display data for extra earnings (to
  * the member) by given "earning name".
  *
- * @param	$earningName	Name of the earning
+ * @param	$earningProvider	Name of the earning
  * @return	$output			Generated HTML output
  */
-function generateMemberEarningDataTable ($earningName) {
+function generateMemberEarningDataTable ($earningProvider) {
 	// Init array for filter
 	$filterData = array(
 		// Minimum points to get
@@ -72,14 +72,14 @@ function generateMemberEarningDataTable ($earningName) {
 		// "earning group"
 		'earning_group'          => 'INVALID',
 		// "earning name" again
-		'earning_name'           => $earningName
+		'earning_provider'       => $earningProvider
 	);
 
 	// Run the filter chain to get the data
 	$filterData = runFilterChain('member_earning_table_data', $filterData);
 
 	// Load the proper template and return it
-	$output = loadTemplate('member_earning_data_' . strtolower($filterData['earning_group']), true, $filterData);
+	$output = loadTemplate('member_earning_data_' . strtolower($filterData['earning_group']), TRUE, $filterData);
 
 	// Return it
 	return $output;
@@ -87,18 +87,8 @@ function generateMemberEarningDataTable ($earningName) {
 
 // Handle earning id
 function doMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
-	// Does the user already have this earning?
-	$result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS `cnt` FROM `{?_MYSQL_PREFIX?}_user_earning` WHERE `earning_id`=%s AND `earning_userid`=%s LIMIT 1",
-		array(
-			bigintval($earningId),
-			getMemberId()
-		), __FUNCTION__, __LINE__);
-
-	// Get the count
-	list($count) = SQL_FETCHROW($result);
-
 	// Does the user have this?
-	if ($count == 1) {
+	if (countSumTotalData(bigintval($earningId), 'user_earning', 'id', 'earning_id', TRUE, ' AND `earning_userid`=' . getMemberId()) == 1) {
 		// Then update it
 		$status = updateMemberEarning($earningId, $dailyAmount, $isActive);
 	} else {
@@ -106,9 +96,6 @@ function doMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
 		$status = insertMemberEarning($earningId, $dailyAmount, $isActive);
 	}
 
-	// Free result
-	SQL_FREERESULT($result);
-
 	// Return status
 	return $status;
 }
@@ -116,7 +103,7 @@ function doMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
 // Insert member earning entry
 function insertMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
 	// Insert the record
-	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_earning` (`earning_id`,`earning_userid`,`earning_daily_amount`,`earning_active`) VALUES(%s,%s,%s,'%s')",
+	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_earning` (`earning_id`, `earning_userid`, `earning_daily_amount`, `earning_active`) VALUES(%s,%s,%s,'%s')",
 		array(
 			bigintval($earningId),
 			getMemberId(),
@@ -126,7 +113,7 @@ function insertMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
 
 	// Prepare content
 	$content = array(
-		'insert_id'    => SQL_INSERTID(),
+		'insert_id'    => SQL_INSERT_ID(),
 		'earning_id'   => bigintval($earningId),
 		'daily_amount' => bigintval($dailyAmount),
 		'is_active'    => $isActive
@@ -153,7 +140,7 @@ function updateMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
 	// Does the user cancel the earning?
 	if ($isActive == 'N') {
 		// Then update cancellation timestamp as well
-		$moreSql = ', `earning_cancelled`=NOW()';
+		$moreSql = ',`earning_canceled`=NOW()';
 	} // END - if
 
 	// Update database record
@@ -173,11 +160,11 @@ LIMIT 1", array(
 		getMemberId()
 	), __FUNCTION__, __LINE__);
 
-	// Determine wether something has changed
+	// Determine whether something has changed
 	$status = (!SQL_HASZEROAFFECTED());
 
 	// Has the record changed?
-	if ($status === true) {
+	if ($status === TRUE) {
 		// Prepare content
 		$content = array(
 			'earning_id'   => bigintval($earningId),