Heavy rewrite:

[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 ce88fd80fb1841a38684cf8150d5624a57526a78..153ae8d42705421aa372cac8abf6724b4fe7fac5 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -55,49 +55,49 @@ if (isFormSent()) {
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name

-       if (!REQUEST_ISSET_POST(('gender'))) {
+       if (!REQUEST_ISSET_POST('gender')) {

                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_GENDER_SELECTED');
                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_GENDER_SELECTED');

-       }
+       } // END - if

 
 

-       if (!REQUEST_ISSET_POST(('surname'))) {
+       if (!REQUEST_ISSET_POST('surname')) {

                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_SURNAME_IS_EMPTY');
                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_SURNAME_IS_EMPTY');

-       }
+       } // END - if

 
 

-       if (!REQUEST_ISSET_POST(('family'))) {
+       if (!REQUEST_ISSET_POST('family')) {

                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_FAMILY_IS_EMPTY');
                // Surname is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_FAMILY_IS_EMPTY');

-       }
+       } // END - if

 
        // 2. Company name
 
        // 2. Company name

-       // 012     3                 32    23      4                   43    3      4                  4321    12      3                 32    2     3                   3210
-       if (((!REQUEST_ISSET_POST(('company'))) && ((REQUEST_ISSET_POST(('tax_ident'))) || (REQUEST_ISSET_POST(('position'))))) || ((REQUEST_ISSET_POST(('company'))) && (!REQUEST_ISSET_POST(('tax_ident'))))) {
-               if (!REQUEST_ISSET_POST(('company'))) {
+       // 012                   3         32    23                  4           43    3                  4          4321    12                  3         32    2                   3           3210
+       if (((!REQUEST_ISSET_POST('company')) && ((REQUEST_ISSET_POST('tax_ident')) || (REQUEST_ISSET_POST('position')))) || ((REQUEST_ISSET_POST('company')) && (!REQUEST_ISSET_POST('tax_ident')))) {
+               if (!REQUEST_ISSET_POST('company')) {

                        // Company name is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_COMPANY_IS_EMPTY');
                        // Company name is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_COMPANY_IS_EMPTY');

-               } elseif (!REQUEST_ISSET_POST(('tax_ident'))) {
+               } elseif (!REQUEST_ISSET_POST('tax_ident')) {

                        // Tax ident number name is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_TAX_IDENT_IS_EMPTY');
                }
 
                        // Tax ident number name is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_TAX_IDENT_IS_EMPTY');
                }
 

-               if (!REQUEST_ISSET_POST(('position'))) {
+               if (!REQUEST_ISSET_POST('position')) {

                        // Not fatal but not nice: position in company is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_POSITION_IS_EMPTY');
                        // Not fatal but not nice: position in company is empty
                        $FORM_ERRORS[] = getMessage('SPONSOR_POSITION_IS_EMPTY');

-               }
-       }
+               } // END - if
+       } // END - if

 
        // 3. Street and number
 
        // 3. Street and number

-       if (!REQUEST_ISSET_POST(('street_nr1'))) {
+       if (!REQUEST_ISSET_POST('street_nr1')) {

                // Street name and house number are empty
                $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY');
                // Street name and house number are empty
                $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY');

-       } elseif ((REQUEST_ISSET_POST(('street_nr2'))) && (!REQUEST_ISSET_POST(('street_nr1')))) {
+       } elseif ((REQUEST_ISSET_POST('street_nr2')) && (!REQUEST_ISSET_POST('street_nr1'))) {

                // 1st line for street is empty, but 2nd line not
                $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY_2_NOT');
        }
 
        // 4. Country code
                // 1st line for street is empty, but 2nd line not
                $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY_2_NOT');
        }
 
        // 4. Country code

-       if (!REQUEST_ISSET_POST(('country'))) {
+       if (!REQUEST_ISSET_POST('country')) {

                // Country code is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_COUNTRY_IS_EMPTY');
        } elseif (strlen(REQUEST_POST('country')) != 2) {
                // Country code is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_COUNTRY_IS_EMPTY');
        } elseif (strlen(REQUEST_POST('country')) != 2) {


@@ -116,16 +116,16 @@ if (isFormSent()) {
        }
 
        // 4. City
        }
 
        // 4. City

-       if (!REQUEST_ISSET_POST(('city'))) {
+       if (!REQUEST_ISSET_POST('city')) {

                // City is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_CITY_IS_EMPTY');
                // City is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_CITY_IS_EMPTY');

-       }
+       } // END - if

 
        // 5. Phone number
 
        // 5. Phone number

-       if (!REQUEST_ISSET_POST(('phone'))) {
+       if (!REQUEST_ISSET_POST('phone')) {

                // City is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_PHONE_IS_EMPTY');
                // City is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_PHONE_IS_EMPTY');

-       }
+       } // END - if

 
        // 6. Homepage URL
        if (!REQUEST_ISSET_POST('url')) {
 
        // 6. Homepage URL
        if (!REQUEST_ISSET_POST('url')) {


@@ -138,7 +138,7 @@ if (isFormSent()) {
        }
 
        // 7. Light validation of email address
        }
 
        // 7. Light validation of email address

-       if ((!REQUEST_ISSET_POST('email')) || (REQUEST_POST('email') == "@")) {
+       if ((!REQUEST_ISSET_POST('email')) || (REQUEST_POST('email') == '@')) {

                // Email is invalid/empty
                $FORM_ERRORS[] = getMessage('SPONSOR_EMAIL_IS_INVALID');
        } elseif (SPONSOR_FOUND_EMAIL_DB(REQUEST_POST('email'))) {
                // Email is invalid/empty
                $FORM_ERRORS[] = getMessage('SPONSOR_EMAIL_IS_INVALID');
        } elseif (SPONSOR_FOUND_EMAIL_DB(REQUEST_POST('email'))) {


@@ -148,22 +148,22 @@ if (isFormSent()) {
        }
 
        // 8. Pay type selected?
        }
 
        // 8. Pay type selected?

-       if (!REQUEST_ISSET_POST(('pay_type'))) {
+       if (!REQUEST_ISSET_POST('pay_type')) {

                // Not pay type selected
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_PAYTYPE_SELECTED');
                // Not pay type selected
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_PAYTYPE_SELECTED');

-       }
+       } // END - if

 
        // 9. Interval of mails
 
        // 9. Interval of mails

-       if (!REQUEST_ISSET_POST(('warning_interval'))) {
+       if (!REQUEST_ISSET_POST('warning_interval')) {

                // No warning interval selected
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_WARNING_INTERVAL_SELECTED');
                // No warning interval selected
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_WARNING_INTERVAL_SELECTED');

-       }
+       } // END - if

 
        // 10. Mail notifications disabled/enabled
 
        // 10. Mail notifications disabled/enabled

-       if (!REQUEST_ISSET_POST(('receive_warnings'))) {
+       if (!REQUEST_ISSET_POST('receive_warnings')) {

                // Option not selected!
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_RECEIVE_WARNINGS_SELECTED');
                // Option not selected!
                $FORM_ERRORS[] = getMessage('SPONSOR_NO_RECEIVE_WARNINGS_SELECTED');

-       }
+       } // END - if

 
        // Did he enter his password twice?
        if (((!REQUEST_ISSET_POST('pass1')) || (!REQUEST_ISSET_POST('pass2'))) || ((REQUEST_POST('pass1') != REQUEST_POST('pass2')) && (REQUEST_ISSET_POST('pass1')) && (REQUEST_ISSET_POST('pass2')))) {
 
        // Did he enter his password twice?
        if (((!REQUEST_ISSET_POST('pass1')) || (!REQUEST_ISSET_POST('pass2'))) || ((REQUEST_POST('pass1') != REQUEST_POST('pass2')) && (REQUEST_ISSET_POST('pass1')) && (REQUEST_ISSET_POST('pass2')))) {


@@ -187,10 +187,10 @@ if (isFormSent()) {
        }
 
        // Check if he has accepted the terms&conditions
        }
 
        // Check if he has accepted the terms&conditions

-       if (!REQUEST_ISSET_POST(('terms'))) {
+       if (!REQUEST_ISSET_POST('terms')) {

                // Homepage URL is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_TERMS_NOT_ACCEPTED');
                // Homepage URL is empty
                $FORM_ERRORS[] = getMessage('SPONSOR_TERMS_NOT_ACCEPTED');

-       }
+       } // END - if

 
        // If there is something wrong/missing stop registration
        if (count($FORM_ERRORS) > 0) REQUEST_UNSET_POST('ok');
 
        // If there is something wrong/missing stop registration
        if (count($FORM_ERRORS) > 0) REQUEST_UNSET_POST('ok');


@@ -204,9 +204,10 @@ if ((isFormSent()) && (count($FORM_ERRORS) == 0)) {
        );
 
        // Calulate points
        );
 
        // Calulate points

-       $result = SQL_QUERY_ESC("SELECT (pay_rate * pay_min_count) AS points, pay_min_count AS pay, pay_currency AS curr
+       $result = SQL_QUERY_ESC("SELECT (`pay_rate` * `pay_min_count`) AS points, `pay_min_count` AS pay, `pay_currency` AS curr

 FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`
 FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`

-WHERE `id`='%s' LIMIT 1", array(REQUEST_POST('pay_type')), __FILE__, __LINE__);
+WHERE `id`='%s' LIMIT 1",
+               array(REQUEST_POST('pay_type')), __FILE__, __LINE__);

        list($points, $pay, $curr) = SQL_FETCHROW($result);
 
        // Free memory
        list($points, $pay, $curr) = SQL_FETCHROW($result);
 
        // Free memory


@@ -222,12 +223,11 @@ WHERE `id`='%s' LIMIT 1", array(REQUEST_POST('pay_type')), __FILE__, __LINE__);
        $STATUS = SPONSOR_HANDLE_SPONSOR(REQUEST_POST_ARRAY(), true, $messageArray, true);
 
        // Check the status of the registration process
        $STATUS = SPONSOR_HANDLE_SPONSOR(REQUEST_POST_ARRAY(), true, $messageArray, true);
 
        // Check the status of the registration process

-       switch ($STATUS)
-       {
-               case "added": // Sponsor successfully added with account status = UNCONFIRMED!
+       switch ($STATUS) {
+               case 'added': // Sponsor successfully added with account status = UNCONFIRMED!

                        // Check for his ID number
                        // Check for his ID number

-                       $result = SQL_QUERY_ESC("SELECT id, hash FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",
-                       array(REQUEST_POST('email')), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `email`='%s' LIMIT 1",
+                               array(REQUEST_POST('email')), __FILE__, __LINE__);

                        if (SQL_NUMROWS($result) == 1) {
                                // ID found so let's load it for the confirmation email
                                list($id, $hash) = SQL_FETCHROW($result);
                        if (SQL_NUMROWS($result) == 1) {
                                // ID found so let's load it for the confirmation email
                                list($id, $hash) = SQL_FETCHROW($result);


@@ -243,11 +243,11 @@ WHERE `id`='%s' LIMIT 1", array(REQUEST_POST('pay_type')), __FILE__, __LINE__);
                                define('__PASSWORD' , REQUEST_POST('pass1'));
 
                                // Generate email and send it to the new sponsor
                                define('__PASSWORD' , REQUEST_POST('pass1'));
 
                                // Generate email and send it to the new sponsor

-                               $EMAIL_MSG = LOAD_EMAIL_TEMPLATE("sponsor_confirm", $hash);
+                               $EMAIL_MSG = LOAD_EMAIL_TEMPLATE('sponsor_confirm', $hash);

                                sendEmail(REQUEST_POST('email'), getMessage('SPONSOR_PLEASE_CONFIRM_SUBJ'), $EMAIL_MSG);
 
                                // Send mail to admin
                                sendEmail(REQUEST_POST('email'), getMessage('SPONSOR_PLEASE_CONFIRM_SUBJ'), $EMAIL_MSG);
 
                                // Send mail to admin

-                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), "admin_sponsor_reg", $hash);
+                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_reg', $hash);

 
                                // Output message: DONE
                                $message = $messageArray['added'];
 
                                // Output message: DONE
                                $message = $messageArray['added'];


@@ -276,9 +276,9 @@ WHERE `id`='%s' LIMIT 1", array(REQUEST_POST('pay_type')), __FILE__, __LINE__);
        LOAD_TEMPLATE('admin_settings_saved', false, $message);
 } else {
        // Check for payment types
        LOAD_TEMPLATE('admin_settings_saved', false, $message);
 } else {
        // Check for payment types

-       $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_currency, pay_min_count
+       $result = SQL_QUERY("SELECT `id`, `pay_name`, `pay_rate`, `pay_currency`, `pay_min_count`

 FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`
 FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`

-ORDER BY pay_name", __FILE__, __LINE__);
+ORDER BY `pay_name`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // Load all types...
                // @TODO Swap this HTML code to templates
        if (SQL_NUMROWS($result) > 0) {
                // Load all types...
                // @TODO Swap this HTML code to templates


@@ -290,7 +290,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        $content['res'] = translateComma($content['pay_rate'] * $content['pay_min_count']);
 
                        // Load row template and switch color
                        $content['res'] = translateComma($content['pay_rate'] * $content['pay_min_count']);
 
                        // Load row template and switch color

-                       $OUT .= LOAD_TEMPLATE("guest_sponsor_payment_row", false, $content);
+                       $OUT .= LOAD_TEMPLATE('guest_sponsor_payment_row', false, $content);

                        $SW = 3 - $SW;
                }
                $OUT .= "</table>\n";
                        $SW = 3 - $SW;
                }
                $OUT .= "</table>\n";


@@ -319,8 +319,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        define('__URL'      , COMPILE_CODE(REQUEST_POST('url')));
 
                        // Check for gender selection
                        define('__URL'      , COMPILE_CODE(REQUEST_POST('url')));
 
                        // Check for gender selection

-                       switch (REQUEST_POST('gender'))
-                       {
+                       switch (REQUEST_POST('gender')) {

                                case 'M': // Male
                                        define('__GENDER_M'  , ' selected="selected"');
                                        define('__GENDER_F'  , '');
                                case 'M': // Male
                                        define('__GENDER_M'  , ' selected="selected"');
                                        define('__GENDER_F'  , '');


@@ -338,11 +337,10 @@ ORDER BY pay_name", __FILE__, __LINE__);
                                        define('__GENDER_F'  , '');
                                        define('__GENDER_C'  , ' selected="selected"');
                                        break;
                                        define('__GENDER_F'  , '');
                                        define('__GENDER_C'  , ' selected="selected"');
                                        break;

-                       }
+                       } // END - if

 
                        // Check for receive_warnings
 
                        // Check for receive_warnings

-                       switch (REQUEST_POST('receive_warnings'))
-                       {
+                       switch (REQUEST_POST('receive_warnings')) {

                                case 'Y':
                                        define('__REC_Y'    , ' selected="selected"');
                                        define('__REC_N'    , '');
                                case 'Y':
                                        define('__REC_Y'    , ' selected="selected"');
                                        define('__REC_N'    , '');


@@ -352,7 +350,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                                        define('__REC_Y'    , '');
                                        define('__REC_N'    , ' selected="selected"');
                                        break;
                                        define('__REC_Y'    , '');
                                        define('__REC_N'    , ' selected="selected"');
                                        break;

-                       }
+                       } // END - if

 
                        // Errors found
                        $OUT = "<P align=\"center\">
 
                        // Errors found
                        $OUT = "<P align=\"center\">


@@ -394,7 +392,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                }
 
                // Prepare referal things
                }
 
                // Prepare referal things

-               if (!REQUEST_ISSET_GET(('refid'))) {
+               if (!REQUEST_ISSET_GET('refid')) {

                        // No referal link
                        define('__SPONSOR_REFID', '0');
                } else  {
                        // No referal link
                        define('__SPONSOR_REFID', '0');
                } else  {


@@ -403,7 +401,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
                }
 
                // Display registration form
                }
 
                // Display registration form

-               LOAD_TEMPLATE("guest_sponsor_reg");
+               LOAD_TEMPLATE('guest_sponsor_reg');

        } else {
                // Nothing added so far
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_PAYMENT_LIST_IS_EMPTY'));
        } else {
                // Nothing added so far
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_PAYMENT_LIST_IS_EMPTY'));