X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=2eac520fe61802cff03aab275fc57ad9ef7d6aac;hp=cfbca85c3f9c03b8379451e5063ee89e4136526e;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hpb=15d03825972c38fbd95abad41f304c7494c5a70e diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index cfbca85c3f..2eac520fe6 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -14,8 +14,6 @@ * $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 * @@ -40,7 +38,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // function ifRequiredRegisterFieldsAreSet (&$array) { @@ -84,7 +82,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)) { @@ -92,18 +90,14 @@ function registerGenerateCategoryTable ($mode, $return=false) { $OUT .= ''; while ($content = SQL_FETCHARRAY($result)) { // Prepare array for the template - $content = array( - '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"'; + $content['default_yes'] = ' checked="checked"'; } else { - $content['def_n'] = ' checked="checked"'; + $content['default_no'] = ' checked="checked"'; } // Load template and switch color @@ -130,26 +124,26 @@ 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; + $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value; } // END - while // Free memory @@ -264,19 +258,14 @@ function doRegistration () { if (strlen(postRequestParameter('day')) == 1) setPostRequestParameter('day' , '0' . postRequestParameter('day')); if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month')); - // Get total ... - // ... confirmed, ... - $confirmedUsers = getTotalConfirmedUser(); - // ... unconfirmed ... - $unconfirmedUsers = getTotalUnconfirmedUser(); - // ... and locked users! - $lockedUsers = getTotalLockedUser(); - // Generate hash which will be inserted into confirmation mail $hash = generateHash(sha1( - $confirmedUsers . getEncryptSeperator() . - $unconfirmedUsers . getEncryptSeperator() . - $lockedUsers . getEncryptSeperator() . + // Get total confirmed, ... + getTotalConfirmedUser() . getEncryptSeperator() . + // ... unconfirmed ... + getTotalUnconfirmedUser() . getEncryptSeperator() . + // ... and locked users! + getTotalLockedUser() . getEncryptSeperator() . postRequestParameter('month') . '-' . postRequestParameter('day') . '-' . postRequestParameter('year') . getEncryptSeperator() . @@ -298,28 +287,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 @@ -329,10 +312,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'].") @@ -394,41 +374,41 @@ function doRegistration () { } // END - if // ... rewrite a zero referal id to the main title - if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle()); + if (!isValidUserId(postRequestParameter('refid'))) setPostRequestParameter('refid', getMainTitle()); // 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' => 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')), ); }