Security line in all includes changed

[mailer.git] / inc / modules / admin / what-edit_sponsor.php

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 9081221758cf789938acd5872cacf61924cd689f..c80ba7483006615ebf20667266376794b81a7d96 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -31,7 +31,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!is_admin())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 }
@@ -41,7 +41,7 @@ ADD_DESCR("admin", basename(__FILE__));
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        // Check for selected sponsor
-       $result = SQL_QUERY_ESC("SELECT company, position, salut, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details
@@ -56,24 +56,24 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                define('__POSITION'   , $DATA['position']);
                define('__TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
-               switch ($DATA['salut'])
+               switch ($DATA['gender'])
                {
                case "M":
-                       define('__SALUT_M', " selected");
-                       define('__SALUT_F', "");
-                       define('__SALUT_C', "");
+                       define('__GENDER_M', " selected");
+                       define('__GENDER_F', "");
+                       define('__GENDER_C', "");
                        break;
 
                case "F":
-                       define('__SALUT_M', "");
-                       define('__SALUT_F', " selected");
-                       define('__SALUT_C', "");
+                       define('__GENDER_M', "");
+                       define('__GENDER_F', " selected");
+                       define('__GENDER_C', "");
                        break;
 
                case "C":
-                       define('__SALUT_M', "");
-                       define('__SALUT_F', "");
-                       define('__SALUT_C', " selected");
+                       define('__GENDER_M', "");
+                       define('__GENDER_F', "");
+                       define('__GENDER_C', " selected");
                        break;
                }
                define('__SURNAME'    , $DATA['surname']);
@@ -159,7 +159,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                                SPONSOR_HANDLE_SPONSOR($_POST);
 
                                // Convert some data for the email template
-                               $_POST['salut'] = TRANSLATE_SEX($_POST['salut']);
+                               $_POST['gender'] = TRANSLATE_GENDER($_POST['gender']);
                                $_POST['warning_interval'] = CREATE_FANCY_TIME($_POST['warning_interval']);
                                if (!$PASS) $_POST['pass1'] = SPONSOR_PASS_UNCHANGED;