Added ability to allow empty passwords, if the user does so, a random password will...

[mailer.git] / inc / modules / guest / what-register.php

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 01773d9b814bed13e12931bcf76744c885974122..d28311ef8aa4f5a2e70b4a28c0edb8646658312d 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -93,15 +93,15 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                }
 
                if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
-                       registerOutputFailedMessage('SHORT_PASS', ': ' . getConfig('pass_len'));
+                       registerOutputFailedMessage('GUEST_SHORT_PASS', ': ' . getPassLen());
                } // END - if
 
                if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === true)) {
                        registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
                } // END - if
 
-               if ((!empty($GLOBALS['register_selected_cats'])) && ($GLOBALS['register_selected_cats'] < getConfig('least_cats'))) {
-                       registerOutputFailedMessage('', '{--CATS_LEAST--}');
+               if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
+                       registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
        } // END - if
 
@@ -123,7 +123,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        $content['max_receive_list'] = addMaxReceiveList('guest', '', true);
 
        // Shall I display the refid or shall I make it editable?
-       if (getConfig('display_refid') == 'Y') {
+       if (isDisplayRefidEnabled()) {
                // Load "hide" form template
                $content['refid_content'] = loadTemplate('guest_register_refid_hide', true);
        } else {