X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=6ff22480a41ea2685d63716e9e68bf699af04520;hb=9553dbc9eed40bfa2beffa79813f2d5cd21fa8ac;hp=cae47656e679cfbb7fb20b4719725843afbdfe95;hpb=bb3448dff42d948cc9752f81047ada54d69e80bd;p=mailer.git
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index cae47656e6..6ff22480a4 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,7 +40,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
//
function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -84,7 +84,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)) {
@@ -126,23 +126,23 @@ function registerGenerateCategoryTable ($mode, $return=false) {
// Outputs a 'failed message'
function registerOutputFailedMessage ($messageId, $extra='') {
if (empty($messageId)) {
- outputHtml('
' . $extra . '
');
+ outputHtml('' . $extra . '
');
} else {
- outputHtml('{--' . $messageId . '--}' . $extra . '
');
+ outputHtml('{--' . $messageId . '--}' . $extra . '
');
}
}
// 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",
+ $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 = '(*)';
+ if ($row['field_required'] == 'Y') $value = '(*)';
// Add it
$content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
@@ -294,28 +294,22 @@ function doRegistration () {
$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_enable_notify`, `beg_rallye_disable_notify`';
- $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
- } // END - if
+ if (!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_enable_notify`, `bonus_rallye_disable_notify`';
- $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
- } // END - if
+ if (!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
@@ -325,10 +319,7 @@ function doRegistration () {
$countryData = bigintval(postRequestParameter('country_code'));
} // END - if
- //////////////////////////////
- // Create user's account... //
- //////////////////////////////
- //
+ // 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'].")
@@ -397,34 +388,34 @@ function doRegistration () {
// 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')),
- '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' => 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')),
- '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')),
);
}