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)) {
SQL_FREERESULT($result);
} else {
// No categories setted up so far...
- $OUT .= loadTemplate('admin_settings_saved', true, '{--NO_CATEGORIES_VISIBLE--}');
+ $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
}
if ($return === true) {
}
}
-// Run a filter for must-fillout fields
-function FILTER_REGISTER_MUST_FILLOUT ($content) {
- // Get all fields for output
- $result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
- __FUNCTION__, __LINE__);
-
- // Walk through all entries
- while ($row = SQL_FETCHARRAY($result)) {
- // Must the user fill out this element?
- $value = '';
- if ($row['field_required'] == 'Y') {
- $value = '<span class="notice">(*)</span>';
- } // END - if
-
- // Add it
- $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
- } // END - while
-
- // Free memory
- SQL_FREERESULT($result);
-
- // Return it
- return $content;
-}
-
// Checks wether the registration data is complete
function isRegistrationDataComplete () {
// Init elements
// Set it back in request
setPostRequestArray($postArray);
- // Did he enter his password twice?
- if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
- if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
- setPostRequestParameter('pass1', '!');
- setPostRequestParameter('pass2', '!');
- } else {
- if (!isPostRequestParameterSet('pass1')) {
- setPostRequestParameter('pass1', '!');
- } else {
- setPostRequestParameter('pass1', '');
- }
- if (!isPostRequestParameterSet('pass2')) {
- setPostRequestParameter('pass2', '!');
- } else {
- setPostRequestParameter('pass2', '');
- }
- }
- $isOkay = false;
- } // END - if
-
// Are both passwords zero length?
if ((strlen(postRequestParameter('pass1')) == 0) && (strlen(postRequestParameter('pass2')) == 0) && ($isOkay === true)) {
// Is the extension 'register' newer or equal 0.5.5?
}
} // END - if
+ // Did he enter his password twice?
+ if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
+ if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
+ setPostRequestParameter('pass1', '!');
+ setPostRequestParameter('pass2', '!');
+ } else {
+ if (!isPostRequestParameterSet('pass1')) {
+ setPostRequestParameter('pass1', '!');
+ } else {
+ setPostRequestParameter('pass1', '');
+ }
+ if (!isPostRequestParameterSet('pass2')) {
+ setPostRequestParameter('pass2', '!');
+ } else {
+ setPostRequestParameter('pass2', '');
+ }
+ }
+ $isOkay = false;
+ } // END - if
+
// Is the password long enouth?
if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
$GLOBALS['registration_short_password'] = true;
if ((postRequestParameter('email') != '!') && (isCheckDoubleEmailEnabled())) {
// Does the email address already exists in our database?
- if ((!isAdmin()) && (isEmailTaken(postRequestParameter('email')))) {
+ if ((isEmailTaken(postRequestParameter('email'))) && (!isAdmin())) {
setPostRequestParameter('email', '?');
$isOkay = false;
} // END - if
$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 (!isBonusNewMemberNotifyEnabled()) {
- $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+ if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
+ $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`';
$GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
} // END - if
// 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','{%%pipe,detectRemoteAddr%%}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
array(
$countryRow,
substr(postRequestParameter('gender'), 0, 1),
generateHash(postRequestParameter('pass1')),
bigintval(postRequestParameter('max_mails')),
bigintval(postRequestParameter('max_mails')),
- makeDatabaseUserId(postRequestParameter('refid')),
- $hash,
- detectRemoteAddr(),
+ makeZeroToNull(postRequestParameter('refid')),
+ $hash
), __FUNCTION__, __LINE__);
// Get his userid
// Did this work?
if ($userid == '0') {
// Something bad happened!
- loadTemplate('admin_settings_saved', false, '{--USER_NOT_REGISTERED--}');
+ displayMessage('{--USER_NOT_REGISTERED--}');
// Stop here
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 $cat => $joined) {
+ 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)",
- array($userid, bigintval($cat)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s, %s)",
+ array(
+ $userid,
+ bigintval($categoryId)
+ ), __FUNCTION__, __LINE__);
} // END - if
} // END - foreach
} // END - if
} // END - switch
// Display information to the user that he got mail and send it away
- $messageGuest = loadEmailTemplate('register-member', $content, $userid, false);
+ $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--}', 'register-admin', $content, $userid);
+ sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $userid);
}
//-----------------------------------------------------------------------------
return $GLOBALS[__FUNCTION__];
}
-// Getter for 'check_double_email'
-function getCheckDoubleEmail () {
- // Is the cache entry set?
- if (!isset($GLOBALS[__FUNCTION__])) {
- // No, so determine it
- $GLOBALS[__FUNCTION__] = getConfig('check_double_email');
- } // END - if
-
- // Return cached entry
- return $GLOBALS[__FUNCTION__];
-}
-
-// Checks wether 'check_double_email' is "YES"
-function isCheckDoubleEmailEnabled () {
- // Is the cache entry set?
- if (!isset($GLOBALS[__FUNCTION__])) {
- // No, so determine it
- $GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
- } // END - if
-
- // Return cached entry
- return $GLOBALS[__FUNCTION__];
-}
-
// Getter for 'register_default'
function getRegisterDefault () {
// Is the cache entry set?
projects / mailer.git / blobdiff