X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=885b670ce1f68ded7d59f5e24be56f7ee4a0ee77;hb=37a43f2538a0555c2e3dd35b3582d339bc284420;hp=18b9be1b48bf06c2a706ec29932637bf6465c705;hpb=c83e419cd563049c7db0a0484caab329c5e59570;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 18b9be1b48..885b670ce1 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.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                    *
@@ -262,7 +260,7 @@ ORDER BY
 						$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="admin_note" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
+						$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
 					}
 
 					// Menu title
@@ -988,7 +986,7 @@ function getReferalLevelPercents ($level) {
  * Dynamic referal system, can also send mails!
  *
  * subject     = Subject line, write in lower-case letters and underscore is allowed
- * userid         = Referal id wich should receive...
+ * userid      = Referal id wich should receive...
  * points      = ... xxx points
  * sendNotify  = shall I send the referal an email or not?
  * refid       = inc/modules/guest/what-confirm.php need this
@@ -1019,15 +1017,20 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 		//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
 	}
 
-	// Default is 'normal' points
-	$data = 'points';
-
-	// Which points, locked or normal?
-	if ($locked === true) $data = 'locked_points';
-
 	// Check user account
 	//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):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
+
 		// This is the user and his ref
 		$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
 
@@ -1061,10 +1064,6 @@ 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) && (!isDirectPaymentEnabled())) $locked = true;
-
 			// Prepare data for the filter
 			$filterData = array(
 				'subject'  => $subject,
@@ -1094,10 +1093,10 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
 				// Send email
 				sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
-			} elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
+			} elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($add_mode == 'direct')) {
 				// Prepare content
 				$content = array(
-					'text'   => '{--REASON_DIRECT_PAYMENT--}',
+					'reason' => '{--REASON_DIRECT_PAYMENT--}',
 					'points' => $ref_points
 				);
 
@@ -1671,7 +1670,7 @@ function generateCategoryOptionsList ($mode) {
 		} // END - foreach
 	} else {
 		// No cateogries are defined yet
-		$OUT = '<option class="member_failed">{--MEMBER_NO_CATEGORIES--}</option>';
+		$OUT = '<option class="notice">{--MEMBER_NO_CATEGORIES--}</option>';
 	}
 
 	// Return HTML code