X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=9818c731240eb16ccebeedb0572315f880d5f33d;hb=77669502ccc2779d32a842f6d523fb68169fadda;hp=3c750c2284a1e8433c7678f7c3de9cc994e12212;hpb=60929c313ccc10e74e2724373f7bc9ee00d774d1;p=mailer.git diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 3c750c2284..9818c73124 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Checks whether all required registration fields are set function ifRequiredRegisterFieldsAreSet (&$array) { // By default all is fine - $ret = true; + $ret = TRUE; foreach ($array as $key => $value) { // Check all fields that must register $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='%s' AND `field_required`='Y' LIMIT 1", @@ -55,10 +55,10 @@ function ifRequiredRegisterFieldsAreSet (&$array) { // if extensions is present check if country code was selected // 01 2 21 12 3 32 234 5 54 4 43 34 4 4 5 5432 2 3 3210 $country = ((!isExtensionActive('country')) || ((isExtensionActive('country')) && (((empty($value)) && ($key == 'cntry')) || (($key == 'country_code') && (!empty($value)))) && (!empty($array['country_code'])))); - if ((empty($value)) && ($country === false)) { + if ((empty($value)) && ($country === FALSE)) { // Required field not set $array[$key] = '!'; - $ret = false; + $ret = FALSE; } // END - if } // END - if @@ -114,7 +114,7 @@ ORDER BY } // Load template and switch color - $OUT .= loadTemplate('guest_cat_row', true, $content); + $OUT .= loadTemplate('guest_cat_row', TRUE, $content); } // END - while $OUT .= ''; @@ -122,7 +122,7 @@ ORDER BY SQL_FREERESULT($result); } else { // No categories setted up so far... - $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true); + $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', TRUE); } // Return generated HTML code @@ -141,12 +141,12 @@ function registerOutputFailedMessage ($messageId, $extra='') { // Checks whether the registration data is complete function isRegistrationDataComplete () { // Init elements - $GLOBALS['registration_ip_timeout'] = false; - $GLOBALS['registration_short_password'] = false; + $GLOBALS['registration_ip_timeout'] = FALSE; + $GLOBALS['registration_short_password'] = FALSE; $GLOBALS['registration_selected_cats'] = '0'; // Default is okay - $isOkay = true; + $isOkay = TRUE; // First we only check the submitted data then we continue... :) // @@ -154,7 +154,7 @@ function isRegistrationDataComplete () { if (postRequestElement('agree') != 'Y') { setPostRequestElement('agree', '!'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'agree=N - User did not agree with terms of usage.'); - $isOkay = false; + $isOkay = FALSE; } // END - if // Did he enter a valid email address? (we really don't care about @@ -162,19 +162,19 @@ function isRegistrationDataComplete () { if ((!isAdmin()) && ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email'))))) { setPostRequestElement('email', '!'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter proper email address.'); - $isOkay = false; + $isOkay = FALSE; } // END - if // And what about surname and family's name? if (!isPostRequestElementSet('surname')) { setPostRequestElement('surname', '!'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter surname.'); - $isOkay = false; + $isOkay = FALSE; } // END - if if (!isPostRequestElementSet('family')) { setPostRequestElement('family', '!'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter family name.'); - $isOkay = false; + $isOkay = FALSE; } // END - if // Get temporary array for modification @@ -187,59 +187,59 @@ function isRegistrationDataComplete () { setPostRequestArray($postArray); // Are both passwords zero length? - if ((strlen(postRequestElement('pass1')) == 0) && (strlen(postRequestElement('pass2')) == 0) && ($isOkay === true)) { + if ((strlen(postRequestElement('password1')) == 0) && (strlen(postRequestElement('password2')) == 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 - setPostRequestElement('pass1', $randomPassword); - setPostRequestElement('pass2', $randomPassword); + setPostRequestElement('password1', $randomPassword); + setPostRequestElement('password2', $randomPassword); } else { // Not allowed or no recent extension version - setPostRequestElement('pass1', '!'); - setPostRequestElement('pass2', '!'); + setPostRequestElement('password1', '!'); + setPostRequestElement('password2', '!'); // ... which is both not okay //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Random password generation not possible, isExtensionInstalledAndNewer(register, 0.5.5)=' . intval(isExtensionInstalledAndNewer('register', '0.5.5')) . ',isRegisterGeneratePasswordEmptyEnabled()=' . intval(isRegisterGeneratePasswordEmptyEnabled())); - $isOkay = false; + $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'))) { + if (((!isPostRequestElementSet('password1')) || (!isPostRequestElementSet('password2'))) || ((postRequestElement('password1') != postRequestElement('password2')) && (isPostRequestElementSet('password1')) && (isPostRequestElementSet('password2')))) { + if ((postRequestElement('password1') != postRequestElement('password2')) && (isPostRequestElementSet('password1')) && (isPostRequestElementSet('password2'))) { // Both passwords did not match - setPostRequestElement('pass1', '!'); - setPostRequestElement('pass2', '!'); + setPostRequestElement('password1', '!'); + setPostRequestElement('password2', '!'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter same passwords.'); } else { - if (!isPostRequestElementSet('pass1')) { + if (!isPostRequestElementSet('password1')) { // Password 1 is empty - setPostRequestElement('pass1', '!'); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter pass1.'); + setPostRequestElement('password1', '!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter password1.'); } else { // Password 2 is empty - setPostRequestElement('pass1', ''); + setPostRequestElement('password1', ''); } - if (!isPostRequestElementSet('pass2')) { + if (!isPostRequestElementSet('password2')) { // Password 2 is empty - setPostRequestElement('pass2', '!'); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter pass2.'); + setPostRequestElement('password2', '!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did not enter password2.'); } else { // Password 1 is empty - setPostRequestElement('pass2', ''); + setPostRequestElement('password2', ''); } } - $isOkay = false; + $isOkay = FALSE; } // END - if // Is the password long enouth? - if ((strlen(postRequestElement('pass1')) < getPassLen()) && ($isOkay === true)) { - $GLOBALS['registration_short_password'] = true; + if ((strlen(postRequestElement('password1')) < getPassLen()) && ($isOkay === TRUE)) { + $GLOBALS['registration_short_password'] = TRUE; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a short password.'); - $isOkay = false; + $isOkay = FALSE; } // END - if // Do this check only when no admin is logged in @@ -262,7 +262,7 @@ function isRegistrationDataComplete () { if ((isEmailTaken(postRequestElement('email'))) && (!isAdmin())) { setPostRequestElement('email', '?'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'User did enter a already used email address.'); - $isOkay = false; + $isOkay = FALSE; } // END - if } // END - if @@ -270,7 +270,7 @@ function isRegistrationDataComplete () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay)); 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?})') == 1); + $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?})') == 1); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay=' . intval($isOkay).',timeout='.intval($GLOBALS['registration_ip_timeout'])); $isOkay = (($isOkay) && (!$GLOBALS['registration_ip_timeout'])); } // END - if @@ -291,19 +291,22 @@ function doUserRegistration () { // Init filter data $filterData = array( // Initialization not done by default - 'init_done' => false + 'init_done' => FALSE ); + // Init extra SQL data + initExtraRegistrationSql(); + // Run the pre-registration chain $filterData = runFilterChain('pre_user_registration', $filterData); // Did the initialization work? - if ($filterData['init_done'] === false) { + if ($filterData['init_done'] === FALSE) { // Something bad happened! displayMessage('{--PRE_USER_REGISTRATION_FAILED--}'); // Stop here - return false; + return FALSE; } // END - if // Create user's account... @@ -369,7 +372,7 @@ function doUserRegistration () { bigintval(postRequestElement('day')), bigintval(postRequestElement('month')), bigintval(postRequestElement('year')), - generateHash(postRequestElement('pass1')), + generateHash(postRequestElement('password1')), bigintval(postRequestElement('max_mails')), bigintval(postRequestElement('max_mails')), convertZeroToNull(postRequestElement('refid')), @@ -381,12 +384,12 @@ function doUserRegistration () { $filterData['register_insert_id'] = bigintval(SQL_INSERTID()); // Did this work? - if (!isValidUserId($filterData['register_insert_id'])) { + if (!isValidId($filterData['register_insert_id'])) { // Something bad happened! displayMessage('{--USER_NOT_REGISTERED--}'); // Stop here - return false; + return FALSE; } // END - if // Shall we reset random refid? Only possible with latest ext-user @@ -430,11 +433,11 @@ function doUserRegistration () { // Registration phase is done here, so for tester accounts we end here if (((getExtensionVersion('user') >= '0.5.0')) && (isTesterUserName(postRequestElement('surname'))) && (ifTesterAccountsAllowed())) { // All fine here - return true; + return TRUE; } // END - if // ... rewrite a zero referral id to the main title - if (!isValidUserId(postRequestElement('refid'))) { + if (!isValidId(postRequestElement('refid'))) { setPostRequestElement('refid', getMainTitle()); } // END - if @@ -454,7 +457,7 @@ function doUserRegistration () { 'zip' => bigintval(postRequestElement('zip')), 'country' => $GLOBALS['register_country_data'], 'refid' => SQL_ESCAPE(postRequestElement('refid')), - 'password' => SQL_ESCAPE(postRequestElement('pass1')), + 'password' => SQL_ESCAPE(postRequestElement('password1')), ); } else { // No ZIP code entered @@ -470,7 +473,7 @@ function doUserRegistration () { 'zip' => '', 'country' => $GLOBALS['register_country_data'], 'refid' => SQL_ESCAPE(postRequestElement('refid')), - 'password' => SQL_ESCAPE(postRequestElement('pass1')), + 'password' => SQL_ESCAPE(postRequestElement('password1')), ); } @@ -486,7 +489,7 @@ function doUserRegistration () { } // END - switch // Display information to the user that he got mail and send it away - $messageGuest = loadEmailTemplate('guest_register_done', $content, $filterData['register_insert_id'], false); + $messageGuest = loadEmailTemplate('guest_register_done', $content, $filterData['register_insert_id'], FALSE); // Send mail to user (confirmation link!) sendEmail($filterData['register_insert_id'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest); @@ -495,7 +498,7 @@ function doUserRegistration () { sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $filterData['register_insert_id']); // All fine - return true; + return TRUE; } // Initialize extra registration SQL @@ -506,24 +509,12 @@ function initExtraRegistrationSql () { // Add extra column for registration SQL function addExtraRegistrationColumns ($column) { - // Is it set? - if (!isset($GLOBALS['register_sql_columns'])) { - // Then initialize it - initExtraRegistrationSql(); - } // END - if - // Add column $GLOBALS['register_sql_columns'] .= $column; } // Add extra data for registration SQL function addExtraRegistrationData ($data) { - // Is it set? - if (!isset($GLOBALS['register_sql_data'])) { - // Then initialize it - initExtraRegistrationSql(); - } // END - if - // Add column $GLOBALS['register_sql_data'] .= $data; } @@ -621,7 +612,7 @@ function isRegisterGeneratePasswordEmptyEnabled () { // ---------------------------------------------------------------------------- // Template helper for generating a category selection table for admin area with given configuration entry -function doTemplateAdminRegisterCategoryTable ($templateName, $clear = false, $configEntry) { +function doTemplateAdminRegisterCategoryTable ($templateName, $clear = FALSE, $configEntry) { // Call the inner function return registerGenerateCategoryTable('admin', $configEntry); }