Several fixes and and improvements:

[mailer.git] / inc / modules / guest / what-sponsor_reg.php

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 875a6584ae249de3f57a911dd99448cdbced4bec..9e61d124e340f1ca7591b7dc2dfd9794001b09ff 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -31,13 +31,13 @@
  ************************************************************************/
 
 // 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);
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 // Create array for form errors (= missing data)
 $FORM_ERRORS = array();
@@ -47,10 +47,10 @@ if (isset($_POST['ok'])) {
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name
-       if (empty($_POST['salut']))
+       if (empty($_POST['gender']))
        {
                // Surname is empty
-               $FORM_ERRORS[] = SPONSOR_NO_SALUT_SELECTED;
+               $FORM_ERRORS[] = SPONSOR_NO_GENDER_SELECTED;
        }
        if (empty($_POST['surname']))
        {
@@ -193,7 +193,7 @@ if (isset($_POST['ok'])) {
                }
        }
        // Is the password long enough?
-        elseif (strlen($_POST['pass1']) < $CONFIG['pass_len'])
+        elseif (strlen($_POST['pass1']) < $_CONFIG['pass_len'])
        {
                // Too short!
                $FORM_ERRORS[] = SPONSOR_PASSWORD_TOO_SHORT;
@@ -254,7 +254,7 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
                        define('__EMAIL'    , $_POST['email']);
                        define('__SURNAME'  , $_POST['surname']);
                        define('__FAMILY'   , $_POST['family']);
-                       define('__SALUT'    , TRANSLATE_SEX($_POST['salut']));
+                       define('__GENDER'    , TRANSLATE_GENDER($_POST['gender']));
                        define('__TIMESTAMP', MAKE_DATETIME(time(), 0));
                        define('__PASSWORD' , $_POST['pass1']);
 
@@ -279,13 +279,11 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
                break;
 
        default:
-               if (!IS_ADMIN())
-               {
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $STATUS));
+               if (!IS_ADMIN()) {
                        // Message for testing admin
                        $MSG = ADMIN_SPONSOR_UNKOWN_STATUS_1.$STATUS.ADMIN_SPONSOR_UNKOWN_STATUS_2;
-               }
-                else
-               {
+               } else {
                        // Message for the guest
                        $MSG = SPONSOR_UNKOWN_STATUS_1.$STATUS.SPONSOR_UNKOWN_STATUS_2;
                }
@@ -294,15 +292,12 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-}
- else
-{
+} else {
        // Check for payment types
        $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_currency, pay_min_count
 FROM "._MYSQL_PREFIX."_sponsor_paytypes
 ORDER BY pay_name", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       if (SQL_NUMROWS($result) > 0) {
                // Load all types...
                $OUT = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"300\" class=\"left2 right2 top2\">\n";
                $SW = 2;
@@ -310,7 +305,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                {
                        $OUT .= "<TR>
   <TD class=\"bottom2 switch_sw".$SW."\" height=\"50\" style=\"padding-left: 2px; padding-right: 2px\">
-    <INPUT type=\"radio\" name=\"pay_type\" class=\"guest_normal\" value=\"".bigintval($id)."\">&nbsp;".$name."<BR>
+    <INPUT type=\"radio\" name=\"pay_type\" class=\"guest_normal\" value=\"".bigintval($id)."\">&nbsp;".$name."<br />
     <DIV align=\"right\">(".$min." ".$curr." = ".TRANSLATE_COMMA($rate * $min)." ".POINTS.")</DIV>
   </TD>
 </TR>\n";
@@ -340,25 +335,25 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        define('__EMAIL'    , COMPILE_CODE($_POST['email']));
                        define('__URL'      , COMPILE_CODE($_POST['url']));
 
-                       // Check for salutation selection
-                       switch ($_POST['salut'])
+                       // Check for gender selection
+                       switch ($_POST['gender'])
                        {
                        case "M": // Male
-                               define('__SALUT_M'  , " selected");
-                               define('__SALUT_F'  , "");
-                               define('__SALUT_C'  , "");
+                               define('__GENDER_M'  , " selected=\"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=\"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=\"selected\"");
                                break;
                        }
 
@@ -366,38 +361,36 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        switch ($_POST['receive_warnings'])
                        {
                        case "Y":
-                               define('__REC_Y'    , " selected");
+                               define('__REC_Y'    , " selected=\"selected\"");
                                define('__REC_N'    , "");
                                break;
 
                        case "N":
                                define('__REC_Y'    , "");
-                               define('__REC_N'    , " selected");
+                               define('__REC_N'    , " selected=\"selected\"");
                                break;
                        }
 
                        // Errors found
                        $OUT = "<P align=\"center\">
-  <STRONG><FONT class=\"guest_failed\">".SPONSOR_REGISTER_SOMETHING_MISSING.":</FONT></STRONG><BR>
+  <STRONG><FONT class=\"guest_failed\">".SPONSOR_REGISTER_SOMETHING_MISSING.":</FONT></STRONG><br />
 </P>
 <OL>\n";
-                       foreach ($FORM_ERRORS as $error)
-                       {
+                       foreach ($FORM_ERRORS as $error) {
                                $OUT .= "<LI>".$error."</LI>\n";
-                       }
-                       $OUT .= "</OL><BR>\n";
+                       } // END - if
+
+                       $OUT .= "</OL><br />\n";
                        define('__SPONSOR_FORM_ERRORS', $OUT);
                        define('__SPONSOR_REFID', $_POST['refid']);
-               }
-                else
-               {
+               } else {
                        // None found, first call
                        define('__COMPANY'  , "");
                        define('__POSITION' , "");
                        define('__TAX_IDENT', "");
-                       define('__SALUT_M'  , "");
-                       define('__SALUT_F'  , "");
-                       define('__SALUT_C'  , "");
+                       define('__GENDER_M'  , "");
+                       define('__GENDER_F'  , "");
+                       define('__GENDER_C'  , "");
                        define('__SURNAME'  , "");
                        define('__FAMILY'   , "");
                        define('__STREET1'  , "");
@@ -417,23 +410,18 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        define('__SPONSOR_FORM_ERRORS', "");
                }
 
-               // Prepare referral things
-               if (!isset($_GET['refid']))
-               {
-                       // No referral link
+               // Prepare referal things
+               if (!isset($_GET['refid'])) {
+                       // No referal link
                        define('__SPONSOR_REFID', "0");
-               }
-                else
-               {
-                       // Referral ID transmitted, we don't care here if it is right or not
+               } else  {
+                       // Referal ID transmitted, we don't care here if it is right or not
                        define('__SPONSOR_REFID', bigintval($_GET['refid']));
                }
 
                // Display registration form
                LOAD_TEMPLATE("guest_sponsor_reg");
-       }
-        else
-       {
+       } else {
                // Nothing added so far
                LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_PAYMENT_LIST_IS_EMPTY);
        }