HTML->XHTML preparation (still *A LOT* to convert

[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 7fe0bf2b7c18a10f4b2007a30fae54f220649fe7..e7318bdfd3ec1308f08467df36e6e4876a88e67f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -37,9 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("register"))) {
        if (IS_ADMIN()) {
-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
        } else {
-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "register");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "register");
        }
        return;
 }
@@ -229,7 +229,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
        // Create user's account... //
        //////////////////////////////
        //
-       $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+       SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
        array(
                $countryRow,
@@ -275,7 +275,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
                 array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
 
                // Update mediadata as well
@@ -290,7 +290,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                foreach ($_POST['cat'] as $cat => $joined) {
                        if ($joined == "Y") {
                                // Insert category entry
-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%s, %s)",
+                               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%s, %s)",
                                 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
                        } // END - if
                } // END - foreach
@@ -365,45 +365,45 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
 } else {
        if ($_POST['agree'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".HAVE_TO_AGREE."</span></strong><br /><br />");
        } // END - if
 
        if ($_POST['addy'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_EMAIL."</span></strong><br /><br />");
                $_POST['addy'] = "";
        } elseif ($_POST['addy'] == "?") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".EMAIL_ALREADY_DB."</span></strong><br /><br />");
                $_POST['addy'] = "";
        }
 
        if ($_POST['surname'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_SURNAME."</span></strong><br /><br />");
                $_POST['surname'] = "";
        } // END - if
 
        if ($_POST['family_name'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_FAMILY."</span></strong><br /><br />");
                $_POST['family_name'] = "";
        } // END - if
 
        if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</span></strong><br /><br />");
        } elseif ($_POST['pass1'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_PASS1."</span></strong><br /><br />");
        } elseif ($_POST['pass2'] == "!") {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_PASS2."</span></strong><br /><br />");
        }
 
        if ($SHORT_PASS) {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</span></strong><br /><br />");
        } // END - if
 
        if ($IP_TIMEOUT) {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</span></strong><br /><br />");
        } // END - if
 
        if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
-               OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</SPAN></STRONG><br /><br />");
+               OUTPUT_HTML("<strong><span class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</span></strong><br /><br />");
        } // END - if
 
        // Generate birthday selection
@@ -455,11 +455,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // Shall I add a counrty selection box or the old input box?
        if (EXT_IS_ACTIVE("country")) {
                // New variant, good!
-               $OUT  = "<SELECT name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
+               $OUT  = "<select name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
                $whereStatement = "WHERE is_active='Y'";
                if (IS_ADMIN()) $whereStatement = "";
                $OUT .= ADD_OPTION_LINES("countries", "id", "descr", $_POST['country_code'], "code", $whereStatement);
-               $OUT .= "</SELECT>";
+               $OUT .= "</select>";
                define('__COUNTRY_CONTENT', $OUT);
        } else {
                // Old out-dated variant