Frameset support entirely removed, TODO extended, minor template fix

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

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index f9130baf9357754eb6a9aedf2ddfec05ad634539..1db6bbdaf832b31b1773de9180c0faca49281bdd 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -31,20 +31,20 @@
  ************************************************************************/
 
 // 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())) {
-       $FATAL[] = EXTENSION_PROBLEM_EXT_INACTIVE;
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
-       $FATAL[] = SPONSOR_ONLY_AREA_ENTERED;
+       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
        return;
 }
 
 // Data for the formular
-$result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, salut
+$result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, gender
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_COOKIE['sponsorid']), $_COOKIE['sponsorpass']), __FILE__, __LINE__);
@@ -63,7 +63,7 @@ if (SQL_NUMROWS($result) == 1) {
                                $MSG = SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB;
                        } else {
                                // Unsecure data which we don't want here
-                               $UNSAFE = array('company', 'position', 'tax_ident', 'salut', 'surname', 'family',
+                               $UNSAFE = array('company', 'position', 'tax_ident', 'gender', 'surname', 'family',
                                                'street_nr1', 'street_nr2', 'zip', 'city', 'country', 'phone', 'fax', 'cell',
                                                'email', 'url');
 
@@ -89,8 +89,15 @@ if (SQL_NUMROWS($result) == 1) {
                } else {
                        // Make yes/no selection
                        switch ($content['receive_warnings']) {
-                               case "Y": define('__YES', " checked"); define('__NO', "");         break;
-                               case "N": define('__YES', "");         define('__NO', " checked"); break;
+                               case "Y":
+                                       define('__YES', " checked=\"checked\"");
+                                       define('__NO', "");
+                                       break;
+
+                               case "N":
+                                       define('__YES', "");
+                                       define('__NO', " checked=\"checked\"");
+                                       break;
                        }
 
                        // Translate current interval into fancy string