Fixes for ref-level 0

[mailer.git] / inc / modules / sponsor / account.php

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index ec754c98e1c08c6dd5f2529eb0557fbfc0982f30..25a03a9e38ab95f426aba90f77966e69c96e2e1b 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -31,7 +31,7 @@
  ************************************************************************/
 
 // 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("sponsor")) && (!IS_ADMIN())) {
@@ -45,7 +45,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
-salut, surname, family, street_nr1, street_nr2, zip, city, country,
+gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
 FROM "._MYSQL_PREFIX."_sponsor_data
@@ -73,9 +73,9 @@ if (SQL_NUMROWS($result) == 1) {
                        } elseif ((!empty($_POST['pass1'])) && (empty($_POST['pass2']))) {
                                // No password two entered
                                $MSG = SPONSOR_PASSWORD_TWO_EMPTY;
-                       } elseif ((!empty($_POST['pass1'])) && (strlen($_POST['pass1']) < $CONFIG['pass_len'])) {
+                       } elseif ((!empty($_POST['pass1'])) && (strlen($_POST['pass1']) < $_CONFIG['pass_len'])) {
                                // Too short password
-                               $MSG = SPONSOR_PASSWORD_TOO_SHORT_1.$CONFIG['pass_len'].SPONSOR_PASSWORD_TOO_SHORT_2;
+                               $MSG = SPONSOR_PASSWORD_TOO_SHORT_1.$_CONFIG['pass_len'].SPONSOR_PASSWORD_TOO_SHORT_2;
                        } else {
                                // Default is we don't want to change password!
                                $PASS_AND = ""; $PASS_DATA = "";
@@ -110,25 +110,25 @@ if (SQL_NUMROWS($result) == 1) {
                                $OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_MESSAGE_GENERATED);
                        }
                } else {
-                       // Check for salutation selection
-                       switch ($content['salut'])
+                       // Check for gender selection
+                       switch ($content['gender'])
                        {
                        case "M": // Male
-                               define('__SALUT_M', " selected");
-                               define('__SALUT_F', "");
-                               define('__SALUT_C', "");
+                               define('__GENDER_M', " selected");
+                               define('__GENDER_F', "");
+                               define('__GENDER_C', "");
                                break;
 
                        case "F": // Female
-                               define('__SALUT_M', "");
-                               define('__SALUT_F', " selected");
-                               define('__SALUT_C', "");
+                               define('__GENDER_M', "");
+                               define('__GENDER_F', " selected");
+                               define('__GENDER_C', "");
                                break;
 
                        case "C": // Company
-                               define('__SALUT_M', "");
-                               define('__SALUT_F', "");
-                               define('__SALUT_C', " selected");
+                               define('__GENDER_M', "");
+                               define('__GENDER_F', "");
+                               define('__GENDER_C', " selected");
                                break;
                        }