Security line in all includes changed

[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 a69272b4b7fd2884b46c763fd01c6d8c091b9f87..f06e9ee66f391b88623d09c432b36ba1501b20c7 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("register")))
-{
+} elseif ((!EXT_IS_ACTIVE("register"))) {
        if (IS_ADMIN()) {
                ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
        } else {
@@ -50,7 +47,6 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
-OPEN_TABLE("100%", "guest_content_align", "");
 global $_CONFIG, $DATA;
 
 // Initialize variables
@@ -131,7 +127,7 @@ if (isset($_POST['ok']))
        if (!IS_ADMIN())
        {
                // Do this check only when no admin is logged in
-               foreach ($_POST['cat'] as $id=>$answer)
+               foreach ($_POST['cat'] as $id => $answer)
                {
                        if ($answer == "Y") $cats++;
                }
@@ -234,11 +230,11 @@ if ((isset($_POST['ok'])) && (!$FAILED))
        // Create user's account... //
        //////////////////////////////
        //
-       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (sex, 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.")
+       $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.")
 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,
-       SQL_ESCAPE(substr($_POST['sex'], 0, 1)),
+       SQL_ESCAPE(substr($_POST['gender'], 0, 1)),
        SQL_ESCAPE($_POST['surname']),
        SQL_ESCAPE($_POST['family_name']),
        SQL_ESCAPE($_POST['street_nr']),
@@ -285,7 +281,7 @@ array(
 
        // Write catgories
        if ((is_array($_POST['cat'])) && (count($_POST['cat']))) {
-               foreach ($_POST['cat'] as $cat=>$joined) {
+               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)",
@@ -294,18 +290,18 @@ array(
                }
        }
 
-       // Rewrite sex
-       $sex = TRANSLATE_SEX($_POST['sex']);
+       // Rewrite gender
+       $gender = TRANSLATE_GENDER($_POST['gender']);
 
        // ... rewrite a zero referral ID to the main title
        if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
 
        // Prepare data array for the email template
-       // Start with the salutation...
+       // Start with the gender...
        $DATA = array(
                'hash'    => $hash,
                'uid'     => $userid,
-               'salut'   => $sex,
+               'gender'   => $gender,
                'surname' => SQL_ESCAPE($_POST['surname']),
                'family'  => SQL_ESCAPE($_POST['family_name']),
                'email'   => SQL_ESCAPE($_POST['addy']),
@@ -471,6 +467,6 @@ array(
        // Display registration form
        LOAD_TEMPLATE("guest_register");
 }
-CLOSE_TABLE();
+
 //
 ?>