* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
}
// Generates a 'category table' for the registration form
-function registerGenerateCategoryTable ($mode, $return=false) {
+function registerGenerateCategoryTable ($mode) {
+ // Init output
$OUT = '';
// Guests are mostly not interested in how many members has
// choosen an individual category
- $AND = "WHERE `visible`='Y' ";
+ $whereStatement = "WHERE `visible`='Y' ";
// Admins are allowed to see every category...
- if (isAdmin()) $AND = '';
+ if (isAdmin()) $whereStatement = '';
// 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` ' . $whereStatement . ' ORDER BY `sort` ASC',
__FUNCTION__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
$content['default_no'] = '';
// Mark categories
- if ((postRequestParameter('cat', $content['id']) == 'Y') || ((isRegisterDefaultEnabled()) && (!isPostRequestParameterSet('cat', $content['id'])))) {
+ if ((postRequestElement('cat', $content['id']) == 'Y') || ((isRegisterDefaultEnabled()) && (!isPostRequestElementSet('cat', $content['id'])))) {
$content['default_yes'] = ' checked="checked"';
} else {
$content['default_no'] = ' checked="checked"';
$OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
}
- if ($return === true) {
- // Return generated HTML code
- return $OUT;
- } else {
- // Output directly (default)
- outputHtml($OUT);
- }
+ // Return generated HTML code
+ return $OUT;
}
// Outputs a 'failed message'
function registerOutputFailedMessage ($messageId, $extra='') {
if (empty($messageId)) {
- outputHtml('<div class="notice">' . $extra . '</div>');
+ outputHtml('<div class="bad">' . $extra . '</div>');
} else {
- outputHtml('<div class="notice">{--' . $messageId . '--}' . $extra . '</div>');
+ outputHtml('<div class="bad">{--' . $messageId . '--}' . $extra . '</div>');
}
}
// First we only check the submitted data then we continue... :)
//
// Did he agree to our Terms Of Usage?
- if (postRequestParameter('agree') != 'Y') {
- setPostRequestParameter('agree', '!');
+ if (postRequestElement('agree') != 'Y') {
+ setPostRequestElement('agree', '!');
$isOkay = false;
} // END - if
// Did he enter a valid email address? (we really don't care about
// that, he has to click on a confirmation link :P )
- if ((!isPostRequestParameterSet('email')) || (!isEmailValid(postRequestParameter('email')))) {
- setPostRequestParameter('email', '!');
+ if ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email')))) {
+ setPostRequestElement('email', '!');
$isOkay = false;
} // END - if
// And what about surname and family's name?
- if (!isPostRequestParameterSet('surname')) {
- setPostRequestParameter('surname', '!');
+ if (!isPostRequestElementSet('surname')) {
+ setPostRequestElement('surname', '!');
$isOkay = false;
} // END - if
- if (!isPostRequestParameterSet('family')) {
- setPostRequestParameter('family', '!');
+ if (!isPostRequestElementSet('family')) {
+ setPostRequestElement('family', '!');
$isOkay = false;
} // END - if
// 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)) {
+ if ((strlen(postRequestElement('pass1')) == 0) && (strlen(postRequestElement('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);
+ setPostRequestElement('pass1', $randomPassword);
+ setPostRequestElement('pass2', $randomPassword);
} else {
// Not allowed or no recent extension version
- setPostRequestParameter('pass1', '!');
- setPostRequestParameter('pass2', '!');
+ setPostRequestElement('pass1', '!');
+ setPostRequestElement('pass2', '!');
// ... which is both not okay
$isOkay = false;
}
} // END - if
+ // Did he enter his password twice?
+ if (((!isPostRequestElementSet('pass1')) || (!isPostRequestElementSet('pass2'))) || ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')))) {
+ if ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2'))) {
+ setPostRequestElement('pass1', '!');
+ setPostRequestElement('pass2', '!');
+ } else {
+ if (!isPostRequestElementSet('pass1')) {
+ setPostRequestElement('pass1', '!');
+ } else {
+ setPostRequestElement('pass1', '');
+ }
+ if (!isPostRequestElementSet('pass2')) {
+ setPostRequestElement('pass2', '!');
+ } else {
+ setPostRequestElement('pass2', '');
+ }
+ }
+ $isOkay = false;
+ } // END - if
+
// Is the password long enouth?
- if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
+ if ((strlen(postRequestElement('pass1')) < getPassLen()) && ($isOkay === true)) {
$GLOBALS['registration_short_password'] = true;
$isOkay = false;
} // END - if
// Do this check only when no admin is logged in
- if (is_array(postRequestParameter('cat'))) {
+ if (is_array(postRequestElement('cat'))) {
// Only continue with array
- foreach (postRequestParameter('cat') as $id => $answer) {
+ foreach (postRequestElement('cat') as $id => $answer) {
// Is this category choosen?
if ($answer == 'Y') {
$GLOBALS['registration_selected_cats']++;
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay).',selected='.$GLOBALS['registration_selected_cats'].'/'.getLeastCats());
$isOkay = (($isOkay) && ($GLOBALS['registration_selected_cats'] >= getLeastCats()));
- if ((postRequestParameter('email') != '!') && (isCheckDoubleEmailEnabled())) {
+ if ((postRequestElement('email') != '!') && (isCheckDoubleEmailEnabled())) {
// Does the email address already exists in our database?
- if ((isEmailTaken(postRequestParameter('email'))) && (!isAdmin())) {
- setPostRequestParameter('email', '?');
+ if ((isEmailTaken(postRequestElement('email'))) && (!isAdmin())) {
+ setPostRequestElement('email', '?');
$isOkay = false;
} // END - if
} // END - if
// Do the registration
function doRegistration () {
// Prepapre month and day of birth
- if (strlen(postRequestParameter('day')) == 1) setPostRequestParameter('day' , '0' . postRequestParameter('day'));
- if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month'));
+ if (strlen(postRequestElement('day')) == 1) setPostRequestElement('day' , '0' . postRequestElement('day'));
+ if (strlen(postRequestElement('month')) == 1) setPostRequestElement('month', '0' . postRequestElement('month'));
// Generate hash which will be inserted into confirmation mail
$hash = generateHash(sha1(
// Get total confirmed, ...
- getTotalConfirmedUser() . getEncryptSeperator() .
+ getTotalConfirmedUser() . getEncryptSeparator() .
// ... unconfirmed ...
- getTotalUnconfirmedUser() . getEncryptSeperator() .
+ getTotalUnconfirmedUser() . getEncryptSeparator() .
// ... and locked users!
- getTotalLockedUser() . getEncryptSeperator() .
- postRequestParameter('month') . '-' .
- postRequestParameter('day') . '-' .
- postRequestParameter('year') . getEncryptSeperator() .
- detectServerName() . getEncryptSeperator() .
- detectRemoteAddr() . getEncryptSeperator() .
+ getTotalLockedUser() . getEncryptSeparator() .
+ postRequestElement('month') . '-' .
+ postRequestElement('day') . '-' .
+ postRequestElement('year') . getEncryptSeparator() .
+ detectServerName() . getEncryptSeparator() .
+ detectRemoteAddr() . getEncryptSeparator() .
detectUserAgent() . '/' .
getSiteKey() . '/' .
getDateKey() . '/' .
// Old way with enterable two-char-code
$countryRow = '`country`';
- $countryData = substr(postRequestParameter('cntry'), 0, 2);
+ $countryData = substr(postRequestElement('cntry'), 0, 2);
// Add design when extension ext-theme is v0.0.8 or greater
// @TODO Rewrite these all to a single filter
$GLOBALS['register_sql_data'] = '';
if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
// Okay, add design here
- $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
- $GLOBALS['register_sql_data'] .= ", '{%pipe,getCurrentTheme%}'";
+ $GLOBALS['register_sql_columns'] .= ',`curr_theme`';
+ $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
if (isExtensionActive('country')) {
// Save with new selectable country code
$countryRow = '`country_code`';
- $countryData = bigintval(postRequestParameter('country_code'));
+ $countryData = bigintval(postRequestElement('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`, `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(), {?ref_payout?}".$GLOBALS['register_sql_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`,
+ `ref_payout`
+ ".$GLOBALS['register_sql_columns']."
+) VALUES (
+ '%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),
- postRequestParameter('surname'),
- postRequestParameter('family'),
- postRequestParameter('street_nr'),
+ substr(postRequestElement('gender'), 0, 1),
+ postRequestElement('surname'),
+ postRequestElement('family'),
+ postRequestElement('street_nr'),
$countryData,
- bigintval(postRequestParameter('zip')),
- postRequestParameter('city'),
- postRequestParameter('email'),
- bigintval(postRequestParameter('day')),
- bigintval(postRequestParameter('month')),
- bigintval(postRequestParameter('year')),
- generateHash(postRequestParameter('pass1')),
- bigintval(postRequestParameter('max_mails')),
- bigintval(postRequestParameter('max_mails')),
- makeZeroToNull(postRequestParameter('refid')),
- $hash,
- detectRemoteAddr(),
+ bigintval(postRequestElement('zip')),
+ postRequestElement('city'),
+ postRequestElement('email'),
+ bigintval(postRequestElement('day')),
+ bigintval(postRequestElement('month')),
+ bigintval(postRequestElement('year')),
+ generateHash(postRequestElement('pass1')),
+ bigintval(postRequestElement('max_mails')),
+ bigintval(postRequestElement('max_mails')),
+ makeZeroToNull(postRequestElement('refid')),
+ $hash
), __FUNCTION__, __LINE__);
// Get his userid
SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0', __FUNCTION__, __LINE__);
} // END - if
- // Update referal table
- updateReferalCounter($userid);
+ // Update referral table
+ updateReferralCounter($userid);
// Write his welcome-points
- initReferalSystem();
- addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister());
+ initReferralSystem();
+ addPointsThroughReferralSystem('register_welcome', $userid, getPointsRegister());
// Write catgories
- if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
- foreach (postRequestParameter('cat') as $categoryId => $joined) {
+ if ((is_array(postRequestElement('cat'))) && (count(postRequestElement('cat')))) {
+ foreach (postRequestElement('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)
} // END - foreach
} // END - if
- // ... rewrite a zero referal id to the main title
- if (!isValidUserId(postRequestParameter('refid'))) {
- setPostRequestParameter('refid', getMainTitle());
+ // ... rewrite a zero referral id to the main title
+ if (!isValidUserId(postRequestElement('refid'))) {
+ setPostRequestElement('refid', getMainTitle());
} // END - if
// Is ZIP code set?
- if (isPostRequestParameterSet('zip')) {
+ if (isPostRequestElementSet('zip')) {
// Prepare data array for the email template
// Start with the gender...
$content = array(
'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')),
+ 'gender' => SQL_ESCAPE(postRequestElement('gender')),
+ 'surname' => SQL_ESCAPE(postRequestElement('surname')),
+ 'family' => SQL_ESCAPE(postRequestElement('family')),
+ 'email' => SQL_ESCAPE(postRequestElement('email')),
+ 'street' => SQL_ESCAPE(postRequestElement('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestElement('city')),
+ 'zip' => bigintval(postRequestElement('zip')),
'country' => $countryData,
- 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
- 'password' => SQL_ESCAPE(postRequestParameter('pass1')),
+ 'refid' => SQL_ESCAPE(postRequestElement('refid')),
+ 'password' => SQL_ESCAPE(postRequestElement('pass1')),
);
} else {
// No ZIP code entered
$content = array(
'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')),
+ 'gender' => SQL_ESCAPE(postRequestElement('gender')),
+ 'surname' => SQL_ESCAPE(postRequestElement('surname')),
+ 'family' => SQL_ESCAPE(postRequestElement('family')),
+ 'email' => SQL_ESCAPE(postRequestElement('email')),
+ 'street' => SQL_ESCAPE(postRequestElement('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestElement('city')),
'zip' => '',
'country' => $countryData,
- 'refid' => SQL_ESCAPE(postRequestParameter('refid')),
- 'password' => SQL_ESCAPE(postRequestParameter('pass1')),
+ 'refid' => SQL_ESCAPE(postRequestElement('refid')),
+ 'password' => SQL_ESCAPE(postRequestElement('pass1')),
);
}
// Continue with birthday...
switch (getLanguage()) {
case 'de':
- $content['birthday'] = bigintval(postRequestParameter('day')) . '.' . bigintval(postRequestParameter('month')) . '.' . bigintval(postRequestParameter('year'));
+ $content['birthday'] = bigintval(postRequestElement('day')) . '.' . bigintval(postRequestElement('month')) . '.' . bigintval(postRequestElement('year'));
break;
default:
- $content['birthday'] = bigintval(postRequestParameter('month')) . '/' . bigintval(postRequestParameter('day')) . '/' . bigintval(postRequestParameter('year'));
+ $content['birthday'] = bigintval(postRequestElement('month')) . '/' . bigintval(postRequestElement('day')) . '/' . bigintval(postRequestElement('year'));
break;
} // END - switch
projects / mailer.git / blobdiff