X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fregister_functions.php;h=719f594bac0450f20592a61da97b3afc287aa248;hb=0f3a135204757cc8750262871c8e62c42300acb4;hp=20d35c2ce7ea735a8b882016511ea22486a368a8;hpb=a30203a40a01c54bb2e10f6b14dc0a2ad3aa5c06;p=mailer.git

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 20d35c2ce7..719f594bac 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -82,7 +82,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 	if (isAdmin()) $AND = '';
 
 	// Look for categories
-	$result = SQL_QUERY('SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
+	$result = SQL_QUERY('SELECT `id`,`cat`,`visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
 		__FUNCTION__, __LINE__);
 
 	if (!SQL_HASZERONUMS($result)) {
@@ -286,27 +286,27 @@ function doRegistration () {
 	$countryRow = '`country`';
 	$countryData = substr(postRequestParameter('cntry'), 0, 2);
 
-	// Add design when extension sql_patches is v0.2.7 or greater
+	// Add design when extension ext-theme is v0.0.8 or greater
 	// @TODO Rewrite these all to a single filter
 	$GLOBALS['register_sql_columns'] = '';
 	$GLOBALS['register_sql_data'] = '';
 	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
 		// Okay, add design here
 		$GLOBALS['register_sql_columns'] .= ', `curr_theme`';
-		$GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
+		$GLOBALS['register_sql_data']    .= ", '{%pipe,getCurrentTheme%}'";
 	} // END - if
 
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
 	if ((isExtensionInstalledAndNewer('beg', '0.2.7')) && (!isBegNewMemberNotifyEnabled())) {
-		$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+		$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`,`beg_rallye_disable_notify`';
 		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
 	// Second: active rallye
 	if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
-		$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+		$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`';
 		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
@@ -320,9 +320,9 @@ function doRegistration () {
 	// Create user's account...
 	SQL_QUERY_ESC("INSERT INTO
 	`{?_MYSQL_PREFIX?}_user_data`
-(`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].")
+(`gender`,`surname`,`family`,`street_nr`,%s, `zip`,`city`,`email`,`birth_day`,`birth_month`,`birth_year`,`password`,`max_mails`,`receive_mails`,`refid`,`status`,`user_hash`,`REMOTE_ADDR`,`joined`,`last_update`,`ref_payout`".$GLOBALS['register_sql_columns'].")
 	VALUES
-('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")",
+('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
 	array(
 		$countryRow,
 		substr(postRequestParameter('gender'), 0, 1),
@@ -339,7 +339,7 @@ function doRegistration () {
 		generateHash(postRequestParameter('pass1')),
 		bigintval(postRequestParameter('max_mails')),
 		bigintval(postRequestParameter('max_mails')),
-		makeDatabaseUserId(postRequestParameter('refid')),
+		makeZeroToNull(postRequestParameter('refid')),
 		$hash,
 		detectRemoteAddr(),
 	), __FUNCTION__, __LINE__);
@@ -356,23 +356,25 @@ function doRegistration () {
 		return;
 	} // END - if
 
-	// Is the refback extension there?
-	// @TODO Rewrite this to a filter
-	if (isExtensionActive('refback')) {
-		// Update refback table
-		updateRefbackTable($userid);
+	// Shall we reset random refid? Only possible with latest ext-user
+	if (isExtensionInstalledAndNewer('user', '0.3.4')) {
+		// Reset all accounts, registration is done
+		SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0', __FUNCTION__, __LINE__);
 	} // END - if
 
+	// Update referal table
+	updateReferalCounter($userid);
+
 	// Write his welcome-points
-	// @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-	addPointsDirectly('register_welcome', $userid, getPointsRegister());
+	initReferalSystem();
+	addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister());
 
 	// Write catgories
 	if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
 		foreach (postRequestParameter('cat') as $categoryId => $joined) {
 			if ($joined == 'Y') {
 				// Insert category entry
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s, %s)",
 					array(
 						$userid,
 						bigintval($categoryId)
@@ -437,9 +439,7 @@ function doRegistration () {
 	$messageGuest = loadEmailTemplate('guest_register_done', $content, $userid, false);
 
 	// Send mail to user (confirmation link!)
-	$email = $content['email'];
-	sendEmail($content['email'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
-	$content['email'] = $email;
+	sendEmail($userid, '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
 
 	// Send mail to admin
 	sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $userid);