Fixed default selection of theme

[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 590e4b9793d9be0350038d72552aeec5a042cdb4..d28311ef8aa4f5a2e70b4a28c0edb8646658312d 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                    *
@@ -54,13 +52,13 @@ if (!isExtensionActive('register')) {
 }
 
 // Is the form sent and all went fine?
-//* DEBUG: */ print intval(isFormSent()) . '/' . intval(isRegistrationDataComplete()) . '/' . intval(isAdmin()) . '<br />';
+//* DEBUG: */ debugOutput('isFormSent=' . intval(isFormSent()) . ',isRegistrationDataComplete=' . intval(isRegistrationDataComplete()) . ',isAdmin=' . intval(isAdmin()));
 if ((isFormSent()) && (isRegistrationDataComplete())) {
        // Do the registration here
        doRegistration();
 
        // Output success registration
-       loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE'));
+       loadTemplate('admin_settings_saved', false, '{--REGISTRATION_DONE--}');
 } else {
        // Do this only if form is sent
        if (isFormSent()) {
@@ -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,12 +123,12 @@ 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, determineReferalId());
+               $content['refid_content'] = loadTemplate('guest_register_refid_hide', true);
        } else {
                // Load template to enter it
-               $content['refid_content'] = loadTemplate('guest_register_refid', true, determineReferalId());
+               $content['refid_content'] = loadTemplate('guest_register_refid', true);
        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)
@@ -147,12 +145,14 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        $content['city']      = SQL_ESCAPE(postRequestParameter('city'));
        $content['email']     = SQL_ESCAPE(postRequestParameter('email'));
 
-       // Prepare country selection box
-       $OUT  = "<select name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
+       // The admin may see all
        $whereStatement = "WHERE `is_active`='Y'";
        if (isAdmin()) $whereStatement = '';
+
+       // Prepare country selection box
+       $OUT  = '<select name="country_code" class="form_select" size="1">';
        $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
-       $OUT .= "</select>";
+       $OUT .= '</select>';
        $content['country'] = $OUT;
 
        // Set must-fillout fields