X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=ce69ffa3eec6937b46eead2ebc738ee7b01e2ffc;hb=83b592ec7b67258426acab646f682830ce9128c7;hp=910f6a551360e8c2d021bb3062e53d10177a66c6;hpb=15d03825972c38fbd95abad41f304c7494c5a70e;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 910f6a5513..ce69ffa3ee 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
 	// Fix empty 'what'
 	if (empty($what)) {
-		$what = getConfig('index_home');
+		$what = getIndexHome();
 	} // END - if
 
 	// Default is not found
@@ -109,7 +109,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 		if (isAdmin()) $ADD = '';
 
 		$dummy = substr($search, 0, -4);
-		$ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
+		$ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
 	} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
 		// Sponsor / engine menu
 		$type     = 'what';
@@ -125,7 +125,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 	}
 
 	// Begin the navigation line
-	if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
+	if (!isset($GLOBALS['nav_depth'])) {
 		// Init nav_depth
 		$GLOBALS['nav_depth'] = '0';
 
@@ -147,7 +147,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 	if (substr($search, -4, 4) == '.php') {
 		// Remove the .php
 		$search = substr($search, 0, -4);
-	} // END - i
+	} // END - if
 
 	if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
 		// Output HTML code
@@ -454,7 +454,6 @@ function fetchUserData ($userid, $column = 'userid') {
 		return true;
 	}
 
-
 	// By default none was found
 	$found = false;
 
@@ -585,13 +584,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 	switch ($mode) {
 		case 'guest':
 			// Guests (in the registration form) are not allowed to select 0 mails per day.
-			$result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC",
+			$result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
 		case 'member':
 			// Members are allowed to set to zero mails per day (we will change this soon!)
-			$result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
+			$result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
 			__FUNCTION__, __LINE__);
 			break;
 
@@ -732,7 +731,7 @@ function getActionFromModuleWhat ($module, $what) {
 		}
 	} elseif ((empty($what)) && ($module != 'admin')) {
 		// Use configured 'home'
-		$what = getConfig('index_home');
+		$what = getIndexHome();
 	} // END - if
 
 	if ($module == 'admin') {
@@ -872,7 +871,10 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 		if ($stats_id > 0) {
 			// Only when we got a real stats id continue searching for the entry
 			$type = 'NORMAL'; $rowName = 'stats_id';
-			if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+			if ($bonus) {
+				$type = 'BONUS';
+				$rowName = 'bonus_id';
+			} // END - if
 
 			// Try to look the entry up
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE %s='%s' AND `userid`=%s AND link_type='%s' LIMIT 1",
@@ -891,8 +893,8 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 
 			// Free memory
 			SQL_FREERESULT($result);
-		}
-	}
+		} // END - if
+	} // END - if
 
 	// Return status for sending routine
 	return $ret;
@@ -908,22 +910,22 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
-			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
 				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
-			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
 				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		}
 	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
 		//* DEBUG: */ debugOutput('COUNT!');
-		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
 			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	} else {
 		// Add all rows
 		//* DEBUG: */ debugOutput('SUM!');
-		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
 			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	}
 
@@ -994,7 +996,7 @@ function getReferalLevelPercents ($level) {
  * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $locked = false, $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $add_mode = 'ref') {
 	//* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
 	// Convert mode to lower-case
 	$add_mode = strtolower($add_mode);
@@ -1006,21 +1008,6 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 		return;
 	} // END - if
 
-	// Prepare data for the filter
-	$filterData = array(
-		'subject'  => $subject,
-		'userid'   => $userid,
-		'points'   => $points,
-		'notify'   => $sendNotify,
-		'refid'    => $refid,
-		'locked'   => $locked,
-		'mode'     => 'add',
-		'sub_mode' => $add_mode,
-	);
-
-	// Filter it now
-	runFilterChain('add_points', $filterData);
-
 	// Count up referal depth
 	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
@@ -1074,6 +1061,25 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
 			} // END - if
 
+			// Determine wether the user has some mails to click before he/she gets the points
+			$locked = false;
+			if ((getUserData('ref_payout') > 0) && (!isDirectPaymentAllowed())) $locked = true;
+
+			// Prepare data for the filter
+			$filterData = array(
+				'subject'  => $subject,
+				'userid'   => $userid,
+				'points'   => $points,
+				'notify'   => $sendNotify,
+				'refid'    => $refid,
+				'locked'   => $locked,
+				'mode'     => 'add',
+				'sub_mode' => $add_mode,
+			);
+
+			// Filter it now
+			runFilterChain('add_points', $filterData);
+
 			// Points updated, maybe I shall send him an email?
 			if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
 				// Prepare content
@@ -1100,14 +1106,17 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
 				// And sent it away
 				sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
-				if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+				if (!isGetRequestParameterSet('mid')) {
+					// Output message to admin
+					loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+				} // END - if
 			}
 
 			// Maybe there's another ref?
 			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
 				// Then let's credit him here...
 				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
-				addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
+				addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'));
 			} // END - if
 		} // END - if
 	} // END - if
@@ -1171,7 +1180,7 @@ function updateReferalCounter ($userid) {
 // because we need it when there is no ext-admins installed
 function sendAdminEmails ($subj, $message) {
 	// Load all admin email addresses
-	$result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Send the email out
 		sendEmail($content['email'], $subj, $message);
@@ -1467,15 +1476,15 @@ function deleteUserAccount ($userid, $reason) {
 	$data['points'] = '0';
 
 	$result = SQL_QUERY_ESC("SELECT
-	(SUM(p.points) - d.used_points) AS points
+	(SUM(p.`points`) - d.`used_points`) AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-	p.userid=d.userid
+	p.`userid`=d.`userid`
 WHERE
-	p.userid=%s
+	p.`userid`=%s
 LIMIT 1",
 		array(bigintval($userid)), __FUNCTION__, __LINE__);
 
@@ -1514,11 +1523,10 @@ LIMIT 1",
 
 	// Add reason and translate points
 	$data['text']   = $reason;
-	$data['points'] = translateComma($data['points']);
 
 	// Now a mail to the user and that's all...
 	$message = loadEmailTemplate('del-user', $data, $userid);
-	sendEmail($userid, '{--ADMIN_DEL_ACCOUNT--}', $message);
+	sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
@@ -1546,7 +1554,7 @@ function getWhatFromModule ($modCheck) {
 			// Is ext-sql_patches installed and newer than 0.0.5?
 			if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
 				// Use it from config
-				$what = getConfig('index_home');
+				$what = getIndexHome();
 			} else {
 				// Use default 'welcome'
 				$what = 'welcome';
@@ -1581,21 +1589,9 @@ function subtractPoints ($subject, $userid, $points) {
 }
 
 // "Getter" for total available receivers
-function getTotalReceivers ($mode='normal') {
-	// Query database
-	$result_all = SQL_QUERY("SELECT
-	`userid`
-FROM
-	`{?_MYSQL_PREFIX?}_user_data`
-WHERE
-	`status`='CONFIRMED' AND `receive_mails` > 0 ".runFilterChain('exclude_users', $mode),
-	__FUNCTION__, __LINE__);
-
+function getTotalReceivers ($mode = 'normal') {
 	// Get num rows
-	$numRows = SQL_NUMROWS($result_all);
-
-	// Free result
-	SQL_FREERESULT($result_all);
+	$numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode));
 
 	// Return value
 	return $numRows;
@@ -1615,7 +1611,7 @@ function generateCategoryOptionsList ($mode) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+	$result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
 		__FUNCTION__, __LINE__);
 
 	// Do we have entries?
@@ -1748,8 +1744,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	// Category given?
 	if ($cat > 0) {
 		// Select category
-		$CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.userid=c.userid";
-		$CAT_WHERE = sprintf(" AND c.cat_id=%s", $cat);
+		$CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
+		$CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat);
 	} // END - if
 
 	// Exclude users in holiday?
@@ -1830,7 +1826,7 @@ ORDER BY
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Get total points of this user
-			$row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+			$row['points'] = getTotalPoints($row['refid']);
 
 			// Get unconfirmed mails
 			$row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);