X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=58564d9b54a388a48e1a99525f58b717e9c6b93e;hb=19d5bac86427b5f0abe5a88a21b551b941488487;hp=981d6f65a75a91f1f0bb1e6cda071d0ea0014a5b;hpb=d74c32ab676919eb5d8483e941f1087179af4b49;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 981d6f65a7..58564d9b54 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -98,18 +98,21 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 		// This is a 'what file'!
 		$type = 'what';
 		$search = substr($file, 5);
-		$ADD = " AND `visible`='Y' AND `locked`='N'";
 
 		// Get access level from it
 		$modCheck = getModuleFromFileName($file, $accessLevel);
 
 		// Do we have admin? Then display all
-		if (isAdmin()) $ADD = '';
+		$ADD = " AND `visible`='Y' AND `locked`='N'";
+		if (isAdmin()) {
+			// Display all!
+			$ADD = '';
+		} // END - if
 
 		$dummy = substr($search, 0, -4);
 		$ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
-	} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
-		// Sponsor / engine menu
+	} elseif ($accessLevel == 'sponsor') {
+		// Sponsor menu
 		$type     = 'what';
 		$search   = $file;
 		$modCheck = getModule();
@@ -205,7 +208,7 @@ ORDER BY
 	`sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 
-	//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+	//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
 	if (!SQL_HASZERONUMS($result_main)) {
 		// There are menus available, so we simply display them... :)
 		$GLOBALS['rows'] = '';
@@ -259,8 +262,8 @@ ORDER BY
 						// Navigation link
 						$OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
 					} else {
-						// Not found! - open
-						$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
+						// Not found - open
+						$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $content['sub_what'] . '%}">';
 					}
 
 					// Menu title
@@ -274,7 +277,7 @@ ORDER BY
 							$OUT .= '</strong>';
 						} // END - if
 					} else {
-						// Not found! - close
+						// Not found - close
 						$OUT .= '</em>';
 					}
 
@@ -305,12 +308,12 @@ ORDER BY
 				if (isFileReadable($INC)) {
 					// Load include file
 					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
-					//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
+					//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat().'*');
 					loadInclude($INC);
-					//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
+					//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat() . '*');
 					if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
 				}
-				//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
+				//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
 			}
 
 			// Free result
@@ -319,7 +322,7 @@ ORDER BY
 			// Count one up
 			$main_cnt++;
 
-			//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+			//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
 			if (SQL_NUMROWS($result_main) > $main_cnt) {
 				// Add seperator
 				$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
@@ -354,7 +357,7 @@ ORDER BY
 		);
 
 		// Load main template
-		//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
+		//* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
 		loadTemplate('menu_table', false, $content);
 	} // END - if
 }
@@ -366,7 +369,9 @@ function isMember () {
 
 	// Fix missing 'last_online' array, damn stupid code :(((
 	// @TODO Try to rewrite this to one or more functions
-	if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
+	if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) {
+		$GLOBALS['last_online'] = array();
+	} // END - if
 
 	// Is the cache entry there?
 	if (isset($GLOBALS[__FUNCTION__])) {
@@ -425,25 +430,31 @@ function isMember () {
 }
 
 // Fetch user data for given user id
-function fetchUserData ($userid, $column = 'userid') {
+function fetchUserData ($value, $column = 'userid') {
+	// Extension ext-user must be there at any case
+	if (!isExtensionActive('user')) {
+		// Absent ext-user is really not good
+		return false;
+	} // END - if
+
 	// If we should look for userid secure&set it here
 	if (substr($column, -2, 2) == 'id') {
 		// Secure userid
-		$userid = bigintval($userid);
+		$value = bigintval($value);
 
 		// Set it here
-		setCurrentUserId($userid);
+		setCurrentUserId($value);
 
 		// Don't look for invalid userids...
-		if (!isValidUserId($userid)) {
+		if (!isValidUserId($value)) {
 			// Invalid, so abort here
-			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
+			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
 		} elseif (isUserDataValid()) {
 			// Use cache, so it is fine
 			return true;
 		}
-	} elseif (isUserDataValid()) {
-		// Use cache, so it is fine
+	} elseif (isUserDataValid())  {
+		// Using cache is fine
 		return true;
 	}
 
@@ -452,11 +463,13 @@ function fetchUserData ($userid, $column = 'userid') {
 
 	// Extra statements
 	$ADD = '';
-	if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+	if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+		$ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+	} // END - if
 
 	// Query for the user
 	$result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
-		array($column, $userid), __FUNCTION__, __LINE__);
+		array($column, $value), __FUNCTION__, __LINE__);
 
 	// Do we have a record?
 	if (SQL_NUMROWS($result) == 1) {
@@ -465,6 +478,8 @@ function fetchUserData ($userid, $column = 'userid') {
 
 		// Set the userid for later use
 		setCurrentUserId($data['userid']);
+
+		// And cache the data for this userid
 		$GLOBALS['user_data'][getCurrentUserId()] = $data;
 
 		// Rewrite 'last_failure' if found and ext-user has version >= 0.3.7
@@ -624,18 +639,21 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 
 // Checks wether the given email address is used.
 function isEmailTaken ($email) {
+	// Replace dot with {DOT}
+	$email = str_replace('.', '{DOT}', $email);
+
 	// Query the database
-	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email` LIKE '%%%s%%' OR `email` LIKE '%%%s%%' LIMIT 1",
-		array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email` LIKE '%%%s%%' LIMIT 1",
+		array($email), __FUNCTION__, __LINE__);
 
 	// Is the email there?
-	$ret = (SQL_NUMROWS($result) == 1);
+	$isTaken = (SQL_NUMROWS($result) == 1);
 
 	// Free the result
 	SQL_FREERESULT($result);
 
 	// Return result
-	return $ret;
+	return $isTaken;
 }
 
 // Validate the given menu action
@@ -656,10 +674,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 	$add = '';
 	if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-	//* DEBUG: */ debugOutput(__LINE__.':'.$mode.'/'.$action.'/'.$what.'*');
+	//* DEBUG: */ debugOutput(__LINE__ . ':' . $mode . '/' . $action . '/' . $what . '*');
 	if (($mode != 'admin') && ($updateEntry === true)) {
 		// Update guest or member menu
-		$sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
+		$sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
 			array(
 				$mode,
 				$action,
@@ -743,7 +761,7 @@ function getActionFromModuleWhat ($module, $what) {
 		// Get it directly from URL
 		return getAction();
 	}
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): ret=' . $data['action']);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' ret=' . $data['action']);
 
 	// Does the module have a menu?
 	if (ifModuleHasMenu($module)) {
@@ -833,7 +851,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
 // Get (basicly) the price of given payment id
 function getPaymentPoints ($pid, $lookFor = 'price') {
 	// Default value...
-	$data[$lookFor] = '-1';
+	$data[$lookFor] = -1;
 
 	// Search for it in database
 	$result = SQL_QUERY_ESC("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
@@ -963,7 +981,7 @@ function getReferalLevelPercents ($level) {
 		// First look for level
 		$key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
 		if ($key !== false) {
-			// Entry found!
+			// Entry found
 			$data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
 
 			// Count cache hit
@@ -990,7 +1008,7 @@ function getReferalLevelPercents ($level) {
 
 /**
  *
- * Dynamic referal system, can also send mails!
+ * Dynamic referal and points system, can also send mails!
  *
  * subject     = Subject line, write in lower-case letters and underscore is allowed
  * userid      = Referal id wich should receive...
@@ -998,105 +1016,112 @@ function getReferalLevelPercents ($level) {
  * sendNotify  = shall I send the referal an email or not?
  * refid       = inc/modules/guest/what-confirm.php need this
  * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
+ * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'REFERAL' to 'DIRECT'
  *               for default value will cause no referal will get points ever!!!)
  */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $addMode = 'REFERAL') {
 	// By default nothing has been added
 	$added = false;
 
 	//* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
-	// Convert mode to lower-case
-	$add_mode = strtolower($add_mode);
+	// Convert mode to upper-case
+	$addMode = strtoupper($addMode);
 
 	// When $userid = '0' add points to jackpot
 	if (($userid == '0') && (isExtensionActive('jackpot'))) {
 		// Add points to jackpot
-		addPointsToJackpot($points);
-		return;
+		return addPointsToJackpot($points);
 	} // END - if
 
 	// Count up referal depth
 	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal system initialized!');
-		$GLOBALS['ref_level'] = '0';
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal system initialized!');
+		$GLOBALS['ref_level'] = NULL;
 	} else {
 		// Increase referal level
 		$GLOBALS['ref_level']++;
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal level increased. DEPTH='.$GLOBALS['ref_level']);
 	}
 
 	// Check user account
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points);
 	if (fetchUserData($userid)) {
 		// Determine wether the user has some mails to click before he/she gets the points
 		$locked = ifUserPointsLocked($userid);
 
-		// Default is 'normal' points
-		$data = 'points';
-
-		// Which points, locked or normal?
-		if ($locked === true) {
-			$data = 'locked_points';
-		} // END - if
+		// Detect database column
+		$pointsColumn = determinePointsColumnFromSubjectLocked($subject, $locked);
 
 		// This is the user and his ref
 		$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
 
 		// Get percents
 		$per = getReferalLevelPercents($GLOBALS['ref_level']);
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$add_mode);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$addMode);
 
 		// Some percents found?
 		if ($per > 0) {
 			// Calculate new points
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level']);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level']);
 			$ref_points = $points * $per / 100;
 
 			// Pay refback here if level > 0 and in ref-mode
-			if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == 'ref') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
+			if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($addMode == 'REFERAL') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
 				$ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
 			} // END - if
 
 			// Update points...
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`=%s LIMIT 1",
-				array($data, $data, $ref_points, bigintval($userid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
+				array(
+					$pointsColumn,
+					$pointsColumn,
+					$ref_points,
+					bigintval($userid),
+					makeZeroToNull($GLOBALS['ref_level'])
+				), __FUNCTION__, __LINE__);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
 
 			// No entry updated?
 			if (SQL_HASZEROAFFECTED()) {
 				// First ref in this level! :-)
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s,%s,%s)",
-					array($data, bigintval($userid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
-				//* 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().')');
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s, %s, %s)",
+					array(
+						$pointsColumn,
+						bigintval($userid),
+						makeZeroToNull($GLOBALS['ref_level']),
+						$ref_points
+					), __FUNCTION__, __LINE__);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
 			} // END - if
 
 			// Check affected rows
 			$added = SQL_AFFECTEDROWS();
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added='.intval($added));
 
 			// 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,
-				'added'    => $added
+				'subject'    => $subject,
+				'userid'     => $userid,
+				'points'     => $points,
+				'ref_points' => $ref_points,
+				'column'     => $pointsColumn,
+				'notify'     => $sendNotify,
+				'refid'      => $refid,
+				'locked'     => $locked,
+				'mode'       => 'add',
+				'add_mode'   => $addMode,
+				'added'      => $added
 			);
 
 			// Filter it now
-			$filterData = runFilterChain('add_points', $filterData);
+			$filterData = runFilterChain('post_add_points', $filterData);
 
 			// Extract $added
 			$added = $filterData['added'];
-			//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):added='.intval($added));
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added='.intval($added));
 
 			// Points updated, maybe I shall send him an email?
 			if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
@@ -1108,11 +1133,11 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				);
 
 				// Load email template
-				$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
+				$message = loadEmailTemplate('guest_user_confirmed_referal', $content, bigintval($userid));
 
 				// Send email
 				sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
-			} elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($add_mode == 'direct')) {
+			} elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($addMode == 'DIRECT')) {
 				// Prepare content
 				$content = array(
 					'reason' => '{--REASON_DIRECT_PAYMENT--}',
@@ -1120,20 +1145,20 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				);
 
 				// Load message
-				$message = loadEmailTemplate('add-points', $content, $userid);
+				$message = loadEmailTemplate('member_add_points', $content, $userid);
 
 				// And sent it away
 				sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
 				if (!isGetRequestParameterSet('mid')) {
 					// Output message to admin
-					loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+					displayMessage('{--ADMIN_POINTS_ADDED--}');
 				} // END - if
 			}
 
 			// Maybe there's another ref?
-			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($addMode == 'REFERAL')) {
 				// Then let's credit him here...
-				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
 				$added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid')));
 			} // END - if
 		} // END - if
@@ -1147,14 +1172,14 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 function updateReferalCounter ($userid) {
 	// Make it sure referal level zero (member him-/herself) is at least selected
 	if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',level='.$GLOBALS['cache_array']['ref_level'][$userid]);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',level='.$GLOBALS['cache_array']['ref_level'][$userid]);
 
 	// Update counter
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
 		array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
 
 	// When no entry was updated then we have to create it here
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):updated=' . SQL_AFFECTEDROWS());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'updated=' . SQL_AFFECTEDROWS());
 	if (SQL_HASZEROAFFECTED()) {
 		// First count!
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
@@ -1162,7 +1187,7 @@ function updateReferalCounter ($userid) {
 				bigintval($userid),
 				$GLOBALS['cache_array']['ref_level'][$userid]
 			), __FUNCTION__, __LINE__);
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid);
 	} // END - if
 
 	// Init referal id
@@ -1174,17 +1199,17 @@ function updateReferalCounter ($userid) {
 		$ref = getUserData('refid');
 	} // END - if
 
-	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.$ref);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',ref='.$ref);
 
 	// When he has a referal...
 	if (($ref > 0) && ($ref != $userid)) {
 		// Move to next referal level and count his counter one up!
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - ADVANCE!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref='.$ref.' - ADVANCE!');
 		$GLOBALS['cache_array']['ref_level'][$userid]++;
 		updateReferalCounter($ref);
 	} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
 		// Remove cache here
-		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):ref='.$ref.' - CACHE!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref='.$ref.' - CACHE!');
 		rebuildCache('refsystem', 'refsystem');
 	}
 
@@ -1217,7 +1242,7 @@ function sendAdminEmails ($subj, $message) {
 // Get id number from administrator's login name
 function getAdminId ($adminLogin) {
 	// By default no admin is found
-	$data['id'] = '-1';
+	$data['id'] = -1;
 
 	// Check cache
 	if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
@@ -1272,7 +1297,7 @@ function setCurrentAdminId ($currentAdminId) {
 // Get password hash from administrator's login name
 function getAdminHash ($adminId) {
 	// By default an invalid hash is returned
-	$data['password'] = '-1';
+	$data['password'] = -1;
 
 	if (isAdminHashSet($adminId)) {
 		// Check cache
@@ -1371,7 +1396,7 @@ function getAdminEmail ($adminId) {
 // Get default ACL  of admin id
 function getAdminDefaultAcl ($adminId) {
 	// By default an invalid ACL value is returned
-	$data['default_acl'] = '***';
+	$data['default_acl'] = 'NO-ACL';
 
 	// Is sql_patches there and was it found in cache?
 	if (!isExtensionActive('sql_patches')) {
@@ -1387,6 +1412,8 @@ function getAdminDefaultAcl ($adminId) {
 		// Load from database
 		$result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+		// Do we have an entry?
 		if (SQL_NUMROWS($result_admin_id) == 1) {
 			// Fetch data
 			$data = SQL_FETCHARRAY($result_admin_id);
@@ -1436,7 +1463,9 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 	} else {
 		// Data from database
 		$SPEC = ', `' . $id . '`';
-		if (!empty($special)) $SPEC = ', `' . $special . '`';
+		if (!empty($special)) {
+			$SPEC = ', `' . $special . '`';
+		} // END - if
 
 		// Query the database
 		$result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC",
@@ -1463,7 +1492,9 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 				}
 
 				// Add it, if set
-				if (!empty($add)) $add = ' ('.$add.')';
+				if (!empty($add)) {
+					$add = ' ('.$add.')';
+				} // END - if
 
 				// Is the call-back function set?
 				if (!empty($callback)) {
@@ -1516,6 +1547,7 @@ function deleteUserAccount ($userid, $reason) {
 	// Init points
 	$data['points'] = '0';
 
+	// Search for the points and user data
 	$result = SQL_QUERY_ESC("SELECT
 	(SUM(p.`points`) - d.`used_points`) AS `points`
 FROM
@@ -1535,6 +1567,7 @@ LIMIT 1",
 		$data = SQL_FETCHARRAY($result);
 
 		// Delete points entries as well
+		// @TODO Rewrite these lines to a filter
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s",
 			array(bigintval($userid)), __FUNCTION__, __LINE__);
 
@@ -1545,7 +1578,9 @@ LIMIT 1",
 		} // END - if
 
 		// Now, when we have all his points adds them do the jackpot!
-		if (isExtensionActive('jackpot')) addPointsToJackpot($data['points']);
+		if (isExtensionActive('jackpot')) {
+			addPointsToJackpot($data['points']);
+		} // END - if
 	} // END - if
 
 	// Free the result
@@ -1566,7 +1601,7 @@ LIMIT 1",
 	$data['text']   = $reason;
 
 	// Now a mail to the user and that's all...
-	$message = loadEmailTemplate('del-user', $data, $userid);
+	$message = loadEmailTemplate('member_user_deleted', $data, $userid);
 	sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
@@ -1706,7 +1741,7 @@ function generateCategoryOptionsList ($mode) {
 }
 
 // Add bonus mail to queue
-function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) {
+function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $categoryId, $mode='normal', $receiver=0) {
 	// Is admin or bonus extension there?
 	if (!isAdmin()) {
 		// Abort here
@@ -1727,27 +1762,21 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 
 	// HTML extension active?
 	if (isExtensionActive('html_mail')) {
-		// No HTML by default
-		$HTML = 'N';
-
-		// HTML mode?
-		if ($mode == 'html') {
-			// Yes, please
-			$HTML = 'Y';
-		} // END - if
+		// Determine if we have HTML mode active
+		$HTML = convertBooleanToYesNo($mode == 'html');
 
 		// Add HTML mail
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
 (`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
 		array(
 			$subject,
 			$text,
 			$receiverList,
 			$points,
-			$seconds,
+			bigintval($seconds),
 			$url,
-			$cat,
+			bigintval($categoryId),
 			$target,
 			bigintval($receiver),
 			$HTML
@@ -1756,15 +1785,15 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
 		// Add regular mail
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
 (`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
 		array(
 			$subject,
 			$text,
 			$receiverList,
 			$points,
-			$seconds,
+			bigintval($seconds),
 			$url,
-			$cat,
+			bigintval($categoryId),
 			$target,
 			bigintval($receiver),
 		), __FUNCTION__, __LINE__);
@@ -1772,7 +1801,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 }
 
 // Generate a receiver list for given category and maximum receivers
-function generateReceiverList ($cat, $receiver, $mode = '') {
+function generateReceiverList ($categoryId, $receiver, $mode = '') {
 	// Init variables
 	$CAT_TABS     = '';
 	$CAT_WHERE    = '';
@@ -1780,8 +1809,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	$result       = false;
 
 	// Secure data
-	$cat      = bigintval($cat);
-	$receiver = bigintval($receiver);
+	$categoryId = bigintval($categoryId);
+	$receiver   = bigintval($receiver);
 
 	// Is the receiver zero and mode set?
 	if (($receiver == '0') && (!empty($mode))) {
@@ -1790,10 +1819,10 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	} // END - if
 
 	// Category given?
-	if ($cat > 0) {
+	if ($categoryId > 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_WHERE = sprintf(" AND c.`cat_id`=%s", $categoryId);
 	} // END - if
 
 	// Exclude users in holiday?
@@ -1804,13 +1833,13 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 
 	if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
 		// Only include HTML receivers
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+		$result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
 			array(
 				$receiver
 			), __FUNCTION__, __LINE__);
 	} else {
 		// Include all
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+		$result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
 			array(
 				$receiver
 			), __FUNCTION__, __LINE__);
@@ -1949,7 +1978,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 				array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
 		} else {
 			// Nothing deleted
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id));
+			displayMessage(getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id));
 		}
 	} // END - if
 
@@ -1985,5 +2014,83 @@ function updateLastActivity($userid) {
 		), __FUNCTION__, __LINE__);
 }
 
+// Get points data for given extension's name
+function getPointsDataArrayFromExtensionName ($ext_name) {
+	// If we have cache, shortcut it here
+	if (isset($GLOBALS['cache_array']['points_data'][$ext_name])) {
+		// Return it
+		return $GLOBALS['cache_array']['points_data'][$ext_name];
+	} // END - if
+
+	// Now checkout the entry in database table
+	$result = SQL_QUERY_ESC("SELECT `id`, `ext_name`, `column_name`, `locked_mode`, `payment_method` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `ext_name`='%s' LIMIT 1",
+		array($ext_name), __FUNCTION__, __LINE__);
+
+	// Do we have an entry?
+	if (SQL_NUMROWS($result) == 1) {
+		// Then load it
+		$pointsData = SQL_FETCHARRAY($result);
+
+		// Add all remaining entries
+		foreach ($pointsData as $key=>$value) {
+			$GLOBALS['cache_array']['points_data'][$ext_name][$key] = $value;
+		} // END - foreach
+	} else {
+		/*
+		 * Having no entry is not bad but it means that all points will go to
+		 * the general account which the user can let payout.
+		 */
+		logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - No entry found, switching to general points account.');
+	}
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return it
+	return $GLOBALS['cache_array']['points_data'][$ext_name];
+}
+
+// Determines the right points column name for given extension and 'locked'
+function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) {
+	// Extension sql_patches must be up-to-date
+	if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
+		// Please update ext-sql_patches
+		debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
+	} // END - if
+
+	// Get the points_data entry
+	$pointsData = getPointsDataArrayFromExtensionName($ext_name);
+
+	// Regular points by default
+	$columnName = $pointsData['column_name'];
+
+	// Are the points locked?
+	if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) {
+		// Locked points, so prefix it
+		$columnName = 'locked_' . $pointsData['column_name'];
+	} // END - if
+
+	// Return the result
+	return $columnName;
+}
+
+// Determines the payment method for given extension and 'locked'
+function getPaymentMethodFromExtensionName ($ext_name) {
+	// Extension sql_patches must be up-to-date
+	if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
+		// Please update ext-sql_patches
+		debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
+	} // END - if
+
+	// Get the points_data entry
+	$pointsData = getPointsDataArrayFromExtensionName($ext_name);
+
+	// Regular points by default
+	$paymentMethod = $pointsData['payment_method'];
+
+	// Return the result
+	return $paymentMethod;
+}
+
 // [EOF]
 ?>