* $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 *
+ * 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 *
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
//
function ifRequiredRegisterFieldsAreSet (&$array) {
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_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// List alle visible modules (or all to the admin)
- $SW = 2;
$OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
while ($content = SQL_FETCHARRAY($result)) {
// Prepare array for the template
- $content = array(
- 'sw' => $SW,
- 'cat' => $content['cat'],
- 'def_y' => '',
- 'def_n' => '',
- 'id' => $content['id'],
- );
+ $content['default_yes'] = '';
+ $content['default_no'] = '';
// Mark categories
- if ((postRequestParameter('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!isPostRequestParameterSet('cat', $content['id'])))) {
- $content['def_y'] = ' checked="checked"';
+ if ((postRequestParameter('cat', $content['id']) == 'Y') || ((isRegisterDefaultEnabled()) && (!isPostRequestParameterSet('cat', $content['id'])))) {
+ $content['default_yes'] = ' checked="checked"';
} else {
- $content['def_n'] = ' checked="checked"';
+ $content['default_no'] = ' checked="checked"';
}
// Load template and switch color
$OUT .= loadTemplate('guest_cat_row', true, $content);
- $SW = 3 - $SW;
- }
+ } // END - while
$OUT .= '</table>';
// Free memory
SQL_FREERESULT($result);
} else {
// No categories setted up so far...
- $OUT .= loadTemplate('admin_settings_saved', true, getMessage('NO_CATEGORIES_VISIBLE'));
+ $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
}
if ($return === true) {
// Outputs a 'failed message'
function registerOutputFailedMessage ($messageId, $extra='') {
if (empty($messageId)) {
- outputHtml('<div class="register_failed">' . $extra . '</div>');
+ outputHtml('<div class="notice">' . $extra . '</div>');
} else {
- outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+ outputHtml('<div class="notice">{--' . $messageId . '--}' . $extra . '</div>');
}
}
-// 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="guest_failed">(*)</span>';
-
- // 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
$GLOBALS['registration_ip_timeout'] = false;
$GLOBALS['registration_short_password'] = false;
- $GLOBALS['register_selected_cats'] = '0';
+ $GLOBALS['registration_selected_cats'] = '0';
// Default is okay
$isOkay = true;
setPostRequestParameter('pass1', '!');
setPostRequestParameter('pass2', '!');
} else {
- if (!isPostRequestParameterSet('pass1')) { setPostRequestParameter('pass1', '!'); } else { setPostRequestParameter('pass1', ''); }
- if (!isPostRequestParameterSet('pass2')) { setPostRequestParameter('pass2', '!'); } else { setPostRequestParameter('pass2', ''); }
+ 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?
+ if ((isExtensionInstalledAndNewer('register', '0.5.5')) && (isRegisterGeneratePasswordEmptyEnabled())) {
+ // Generate a random password
+ $randomPassword = generatePassword();
+
+ // Set it in both entries
+ setPostRequestParameter('pass1', $randomPassword);
+ setPostRequestParameter('pass2', $randomPassword);
+ } else {
+ // Not allowed or no recent extension version
+ setPostRequestParameter('pass1', '!');
+ setPostRequestParameter('pass2', '!');
+
+ // ... which is both not okay
+ $isOkay = false;
+ }
+ } // END - if
+
// Is the password long enouth?
- if ((strlen(postRequestParameter('pass1')) < getConfig('pass_len')) && ($isOkay === true)) {
+ if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
$GLOBALS['registration_short_password'] = true;
$isOkay = false;
} // END - if
foreach (postRequestParameter('cat') as $id => $answer) {
// Is this category choosen?
if ($answer == 'Y') {
- $GLOBALS['register_selected_cats']++;
+ $GLOBALS['registration_selected_cats']++;
} // END - if
} // END - foreach
} // END - if
// Enougth categories selected?
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay).',selected='.$GLOBALS['register_selected_cats'].'/'.getConfig('least_cats'));
- $isOkay = (($isOkay) && ($GLOBALS['register_selected_cats'] >= getConfig('least_cats')));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay).',selected='.$GLOBALS['registration_selected_cats'].'/'.getLeastCats());
+ $isOkay = (($isOkay) && ($GLOBALS['registration_selected_cats'] >= getLeastCats()));
- if ((postRequestParameter('email') != '!') && (getConfig('check_double_email') == 'Y')) {
+ 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
// Check for IP timeout?
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay));
- if ((!isAdmin()) && (getConfig('ip_timeout') > 0)) {
+ if ((!isAdmin()) && (getIpTimeout() > 0)) {
// Check his IP number
$GLOBALS['registration_ip_timeout'] = (countSumTotalData(detectRemoteAddr() , 'user_data', 'userid', 'REMOTE_ADDR', true, " AND ((UNIX_TIMESTAMP() - `joined`) < {?ip_timeout?} OR (UNIX_TIMESTAMP() - `last_update`) < {?ip_timeout?}) LIMIT 1") == 1);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay).',timeout='.intval($GLOBALS['registration_ip_timeout']));
if (strlen(postRequestParameter('day')) == 1) setPostRequestParameter('day' , '0' . postRequestParameter('day'));
if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month'));
- // Get total ...
- // ... confirmed, ...
- $confirmedUsers = countSumTotalData('CONFIRMED' , 'user_data', 'userid', 'status', true);
- // ... unconfirmed ...
- $unconfirmedUsers = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
- // ... and locked users!
- $lockedUsers = countSumTotalData('LOCKED' , 'user_data', 'userid', 'status', true);
-
// Generate hash which will be inserted into confirmation mail
$hash = generateHash(sha1(
- $confirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
- $unconfirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
- $lockedUsers . getConfig('ENCRYPT_SEPERATOR') .
+ // Get total confirmed, ...
+ getTotalConfirmedUser() . getEncryptSeperator() .
+ // ... unconfirmed ...
+ getTotalUnconfirmedUser() . getEncryptSeperator() .
+ // ... and locked users!
+ getTotalLockedUser() . getEncryptSeperator() .
postRequestParameter('month') . '-' .
postRequestParameter('day') . '-' .
- postRequestParameter('year') . getConfig('ENCRYPT_SEPERATOR') .
- detectServerName() . getConfig('ENCRYPT_SEPERATOR') .
- detectRemoteAddr() . getConfig('ENCRYPT_SEPERATOR') .
+ postRequestParameter('year') . getEncryptSeperator() .
+ detectServerName() . getEncryptSeperator() .
+ detectRemoteAddr() . getEncryptSeperator() .
detectUserAgent() . '/' .
- getConfig('SITE_KEY') . '/' .
- getConfig('DATE_KEY') . '/' .
+ getSiteKey() . '/' .
+ getDateKey() . '/' .
getConfig('CACHE_BUSTER')
));
$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_columns'] .= ', `curr_theme`';
+ $GLOBALS['register_sql_data'] .= ", '" . 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.8')) {
- // Okay, shall I disable now?
- if (getConfig('beg_new_member_notify') != 'Y') {
- $GLOBALS['register_sql_columns'] .= ', `beg_rallye_notify`, `beg_rallye_enable_notify`';
- $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
- } // END - if
+ if ((isExtensionInstalledAndNewer('beg', '0.2.7')) && (!isBegNewMemberNotifyEnabled())) {
+ $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 (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
- // Okay, shall I disable now?
- if (getConfig('bonus_new_member_notify') != 'Y') {
- $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_notify`, `bonus_rallye_enable_notify`';
- $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
- } // END - if
+ 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
// Write user data to table
$countryData = bigintval(postRequestParameter('country_code'));
} // 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'].")
-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'].")",
+ // 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'].")
+ 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'].")",
array(
$countryRow,
substr(postRequestParameter('gender'), 0, 1),
generateHash(postRequestParameter('pass1')),
bigintval(postRequestParameter('max_mails')),
bigintval(postRequestParameter('max_mails')),
- bigintval(postRequestParameter('refid')),
+ makeZeroToNull(postRequestParameter('refid')),
$hash,
detectRemoteAddr(),
), __FUNCTION__, __LINE__);
// Did this work?
if ($userid == '0') {
// Something bad happened!
- loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
+ displayMessage('{--USER_NOT_REGISTERED--}');
// Stop here
return;
} // END - if
// Write his welcome-points
- // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
// @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
- array($userid), __FUNCTION__, __LINE__);
- if (SQL_HASZERONUMS($result)) {
- // Add only when the line was not found (maybe some more secure?)
- $locked = 'points';
-
- // Pay him later. First he has to confirm some mails!
- if (getConfig('ref_payout') > 0) $locked = 'locked_points';
-
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s,0,'{?points_register?}')",
- array($locked, $userid), __FUNCTION__, __LINE__);
-
- // Update mediadata as well
- if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
- // Update database
- updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
- } // END - if
- } // END - if
+ addPointsDirectly('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__);
+ array(
+ $userid,
+ bigintval($categoryId)
+ ), __FUNCTION__, __LINE__);
} // END - if
} // END - foreach
} // END - if
// ... rewrite a zero referal id to the main title
- if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getConfig('MAIN_TITLE'));
+ if (!isValidUserId(postRequestParameter('refid'))) {
+ setPostRequestParameter('refid', getMainTitle());
+ } // END - if
// Is ZIP code set?
if (isPostRequestParameterSet('zip')) {
// Prepare data array for the email template
// Start with the gender...
$content = array(
- 'hash' => $hash,
- 'userid' => $userid,
- 'gender' => translateGender(postRequestParameter('gender')),
- 'surname' => SQL_ESCAPE(postRequestParameter('surname')),
- 'family' => SQL_ESCAPE(postRequestParameter('family')),
- 'email' => SQL_ESCAPE(postRequestParameter('email')),
- 'street' => SQL_ESCAPE(postRequestParameter('street_nr')),
- 'city' => SQL_ESCAPE(postRequestParameter('city')),
- 'zip' => bigintval(postRequestParameter('zip')),
- 'country' => $countryData,
- 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
- 'pass' => SQL_ESCAPE(postRequestParameter('pass1')),
+ 'hash' => $hash,
+ 'userid' => $userid,
+ 'gender' => SQL_ESCAPE(postRequestParameter('gender')),
+ 'surname' => SQL_ESCAPE(postRequestParameter('surname')),
+ 'family' => SQL_ESCAPE(postRequestParameter('family')),
+ 'email' => SQL_ESCAPE(postRequestParameter('email')),
+ 'street' => SQL_ESCAPE(postRequestParameter('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestParameter('city')),
+ 'zip' => bigintval(postRequestParameter('zip')),
+ 'country' => $countryData,
+ 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
+ 'password' => SQL_ESCAPE(postRequestParameter('pass1')),
);
} else {
// No ZIP code entered
$content = array(
- 'hash' => $hash,
- 'userid' => $userid,
- 'gender' => translateGender(postRequestParameter('gender')),
- 'surname' => SQL_ESCAPE(postRequestParameter('surname')),
- 'family' => SQL_ESCAPE(postRequestParameter('family')),
- 'email' => SQL_ESCAPE(postRequestParameter('email')),
- 'street' => SQL_ESCAPE(postRequestParameter('street_nr')),
- 'city' => SQL_ESCAPE(postRequestParameter('city')),
- 'zip' => '',
- 'country' => $countryData,
- 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
- 'pass' => SQL_ESCAPE(postRequestParameter('pass1')),
+ 'hash' => $hash,
+ 'userid' => $userid,
+ 'gender' => SQL_ESCAPE(postRequestParameter('gender')),
+ 'surname' => SQL_ESCAPE(postRequestParameter('surname')),
+ 'family' => SQL_ESCAPE(postRequestParameter('family')),
+ 'email' => SQL_ESCAPE(postRequestParameter('email')),
+ 'street' => SQL_ESCAPE(postRequestParameter('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestParameter('city')),
+ 'zip' => '',
+ 'country' => $countryData,
+ 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
+ 'password' => SQL_ESCAPE(postRequestParameter('pass1')),
);
}
} // END - switch
// Display information to the user that he got mail and send it away
- $messageGuest = loadEmailTemplate('register-member', $content, $userid);
+ $messageGuest = loadEmailTemplate('guest_register_done', $content, $userid, false);
// Send mail to user (confirmation link!)
$email = $content['email'];
- sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
+ sendEmail($content['email'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
$content['email'] = $email;
// Send mail to admin
- sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid);
+ sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $userid);
+}
+
+//-----------------------------------------------------------------------------
+// Wrapper functions for ext-register
+//-----------------------------------------------------------------------------
+
+// Getter for 'display_refid'
+function getDisplayRefid () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = getConfig('display_refid');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'display_refid' is "YES"
+function isDisplayRefidEnabled () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = (getDisplayRefid() == 'Y');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'ip_timeout'
+function getIpTimeout () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = getConfig('ip_timeout');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'register_default'
+function getRegisterDefault () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = getConfig('register_default');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'register_default' is "YES"
+function isRegisterDefaultEnabled () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = (getRegisterDefault() == 'Y');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'register_generate_password_empty'
+function getRegisterGeneratePasswordEmpty () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = getConfig('register_generate_password_empty');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'register_generate_password_empty' is "YES"
+function isRegisterGeneratePasswordEmptyEnabled () {
+ // Is the cache entry set?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // No, so determine it
+ $GLOBALS[__FUNCTION__] = (getRegisterGeneratePasswordEmpty() == 'Y');
+ } // END - if
+
+ // Return cached entry
+ return $GLOBALS[__FUNCTION__];
}
// [EOF]
projects / mailer.git / blobdiff