Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[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..d38988eb589c61ac352094d2278b1a507ffabf2f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -54,13 +54,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()) {
@@ -147,12 +147,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="guest_select" size="1">';
        $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
-       $OUT .= "</select>";
+       $OUT .= '</select>';
        $content['country'] = $OUT;
 
        // Set must-fillout fields