* $Author:: $ *
* -------------------------------------------------------------------- *
* 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 *
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
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
detectServerName() . getEncryptSeperator() .
detectRemoteAddr() . getEncryptSeperator() .
detectUserAgent() . '/' .
- getConfig('SITE_KEY') . '/' .
- getConfig('DATE_KEY') . '/' .
+ getSiteKey() . '/' .
+ getDateKey() . '/' .
getConfig('CACHE_BUSTER')
));
// Did this work?
if ($userid == '0') {
// Something bad happened!
- loadTemplate('admin_settings_saved', false, '{--USER_NOT_REGISTERED--}');
+ displayMessage('{--USER_NOT_REGISTERED--}');
// Stop here
return;
// 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
} // 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'];
$content['email'] = $email;
// 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?