Opps, not all elements for sprintf() has been set.

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c199c3affce760aeba5f8477bf8e0fc299d3872d..5041a8c3a66b6f509535af2a3b2ec032f563c283 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -303,10 +303,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        } // END - if
 
        // Debug message
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isUserDataValid()=' . intval(isUserDataValid()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isValidUserData()=' . intval(isValidUserData()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
 
        // Is there an entry?
-       if (($errorCode == '0') && (isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
+       if (($errorCode == '0') && (isValidUserData()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
                // Check for old MD5 passwords
                if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
                        // Just set the hash to the password from DB... :)
@@ -393,13 +393,13 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                        // Wrong password!
                        $errorCode = getCode('WRONG_PASS');
                }
-       } elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
+       } elseif ((isValidUserData()) && (getUserData('status') != 'CONFIRMED')) {
                // Create an error code from given status
                $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
                // Set userid in session
                setSession('userid', getUserData('userid'));
-       } elseif (!isUserDataValid()) {
+       } elseif (!isValidUserData()) {
                // User id not found
                $errorCode = getCode('WRONG_ID');
        } else {
@@ -466,7 +466,7 @@ function doNewUserPassword ($email, $userid) {
                                ), getUserData('userid'));
 
                        // ... and send it away
-                       sendEmail(bigintval(getUserData('userid')), '{--GUEST_NEW_PASSWORD--}', $message);
+                       sendEmail(bigintval(getUserData('userid')), '{--GUEST_NEW_PASSWORD_SUBJECT--}', $message);
 
                        // Output note to user
                        displayMessage('{--GUEST_NEW_PASSWORD_SEND--}');
@@ -875,8 +875,8 @@ function isUserSubIdAssignedToMember ($subId, $userid = NULL) {
                                                'user_subids',
                                                'id',
                                                'userid',
-                                               true,
-                                               sprintf(" AND `id`=%s", bigintval($subId))
+                                               TRUE,
+                                               sprintf(' AND `id`=%s', bigintval($subId))
                                ) == 1
                        )
                );
@@ -923,6 +923,74 @@ function getTotalMemberSubIds () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// Displays generic user registration form
+function doDisplayGenericUserRegistrationForm () {
+       // Do this only if form is sent
+       if (isFormSent()) {
+               if (postRequestElement('agree') == '!') {
+                       registerOutputFailedMessage('HAVE_TO_AGREE');
+               } // END - if
+
+               if (postRequestElement('email') == '!') {
+                       registerOutputFailedMessage('ENTER_EMAIL');
+                       setPostRequestElement('email', '');
+               } elseif (postRequestElement('email') == '?') {
+                       registerOutputFailedMessage('GUEST_EMAIL_IS_ALREADY_REGISTERED');
+                       setPostRequestElement('email', '');
+               }
+
+               if (postRequestElement('surname') == '!') {
+                       registerOutputFailedMessage('ENTER_SURNAME');
+                       setPostRequestElement('surname', '');
+               } // END - if
+
+               if (postRequestElement('family') == '!') {
+                       registerOutputFailedMessage('ENTER_FAMILY');
+                       setPostRequestElement('family', '');
+               } // END - if
+
+               if ((postRequestElement('password1') == '!') && (postRequestElement('password2') == '!')) {
+                       registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
+               } elseif (postRequestElement('password1') == '!') {
+                       registerOutputFailedMessage('ENTER_PASSWORD1');
+               } elseif (postRequestElement('password2') == '!') {
+                       registerOutputFailedMessage('ENTER_PASSWORD2');
+               }
+
+               if ((isset($GLOBALS['registration_weak_password'])) && ($GLOBALS['registration_weak_password'] === TRUE)) {
+                       registerOutputFailedMessage('GUEST_WEAK_PASSWORD');
+               } // END - if
+
+               if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === TRUE)) {
+                       registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
+               } // END - if
+
+               if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
+                       registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
+               } // END - if
+       } // END - if
+
+       // Generate birthday selection
+       $content['birthday_selection'] = generateDayMonthYearSelectionBox(postRequestElement('day'),postRequestElement('month'),postRequestElement('year'));
+
+       // ZIP codes are numerical values
+       $content['zip'] = '';
+       if ((isPostRequestElementSet('zip')) && (isValidNumber(postRequestElement('zip')))) {
+               $content['zip'] = bigintval(postRequestElement('zip'));
+       } // END - if
+
+       // Other values
+       foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
+               $content[$entry] = sqlEscapeString(postRequestElement($entry));
+       } // END - foreach
+
+       // Set must-fillout fields
+       $content = runFilterChain('register_must_fillout', $content);
+
+       // Display registration form
+       loadTemplate('guest_register', FALSE, $content);
+}
+
 //-----------------------------------------------------------------------------
 //                                EL code functions
 //-----------------------------------------------------------------------------
@@ -948,7 +1016,7 @@ function doExpressionUser ($data) {
                        // Fix all together
                        $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
                }
-       } elseif ((!empty($data['callback'])) && (isUserDataValid())) {
+       } elseif ((!empty($data['callback'])) && (isValidUserData())) {
                // "Call-back" alias column for current logged in user's data
                $functionName = "getUserData('" . $data['callback'] . "')";
        }