The usual asset of bugfixes/improvements:

[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 c712e17ca7df4edeecb36187b9d10d03c948bb16..d13201971e3f3194ffbd37015ef08b6092a49748 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.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                    *
@@ -43,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if (!isExtensionActive('register')) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('register'));
@@ -72,7 +70,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                        registerOutputFailedMessage('ENTER_EMAIL');
                        setPostRequestParameter('email', '');
                } elseif (postRequestParameter('email') == '?') {
-                       registerOutputFailedMessage('EMAIL_ALREADY_DB');
+                       registerOutputFailedMessage('GUEST_EMAIL_ALREADY_DB');
                        setPostRequestParameter('email', '');
                }
 
@@ -95,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('', getMessage('CATS_LEAST'));
+               if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
+                       registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
        } // END - if
 
@@ -125,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 {
@@ -152,7 +150,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        if (isAdmin()) $whereStatement = '';
 
        // Prepare country selection box
-       $OUT  = '<select name="country_code" class="guest_select" size="1">';
+       $OUT  = '<select name="country_code" class="form_select" size="1">';
        $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
        $OUT .= '</select>';
        $content['country'] = $OUT;