Heavy rewrite:

[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 d2b000d90d27c2feb59a3762b177d82677b77a92..3c3cf9120b7c394e269e3672f955523164cc2a28 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -47,23 +47,32 @@ ADD_DESCR('admin', __FILE__);
 
 if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
        // Check for selected sponsor
-       $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(REQUEST_GET('id'))), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1) {
+       $result_main = 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(REQUEST_GET('id'))), __FILE__, __LINE__);
+       if (SQL_NUMROWS($result_main) == 1) {
                // Load sponsor details
-               $DATA = SQL_FETCHARRAY($result);
-               SQL_FREERESULT($result);
+               $DATA = SQL_FETCHARRAY($result_main);
 
                // Prepare all data for the template
                //  Sponsor's ID
                define('__SPONSOR_ID' , bigintval(REQUEST_GET('id')));
+
                //  Company's data
                define('__COMPANY'    , $DATA['company']);
                define('__POSITION'   , $DATA['position']);
                define('__TAX_IDENT'  , $DATA['tax_ident']);
+
                //  Personal data
-               switch ($DATA['gender'])
-               {
+               switch ($DATA['gender']) {
                        case 'M':
                                define('__GENDER_M', ' selected="selected"');
                                define('__GENDER_F', '');
@@ -107,23 +116,22 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                // Sponsor was found
                if ((isFormSent()) || (REQUEST_ISSET_POST('edit'))) {
                        // Perform action on mode
-                       switch (REQUEST_GET('mode'))
-                       {
-                               case "add_points": // Add points
+                       switch (REQUEST_GET('mode')) {
+                               case 'add_points': // Add points
                                        if (strval(REQUEST_POST('points')) > 0) {
                                                // Replace german decimal comma with computer's decimal dot
                                                $POINTS = strval(convertCommaToDot(REQUEST_POST('points')));
 
                                                // Add points to account
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET points_amount=points_amount+%s WHERE `id`='%s' LIMIT 1",
-                                               array($POINTS, bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `points_amount`=`points_amount`+%s WHERE `id`='%s' LIMIT 1",
+                                                       array($POINTS, bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                define('__POINTS' , translateComma($POINTS));
                                                define('__REASON' , REQUEST_POST('reason'));
 
                                                // Send email
-                                               $msg = LOAD_EMAIL_TEMPLATE("sponsor_add_points", REQUEST_POST('reason'), true);
+                                               $msg = LOAD_EMAIL_TEMPLATE('sponsor_add_points', REQUEST_POST('reason'), true);
                                                sendEmail(__EMAIL, ADMIN_SPONSOR_ADD_POINTS_SUBJ, $msg);
                                                $message = ADMIN_SPONSOR_POINTS_ADDED;
                                        } else {
@@ -132,21 +140,21 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                                        }
                                        break;
 
-                               case "sub_points": // Subtract points
+                               case 'sub_points': // Subtract points
                                        if (strval(REQUEST_POST('points')) > 0) {
                                                // Replace german decimal comma with computer's decimal dot
                                                $POINTS = strval(convertCommaToDot(REQUEST_POST('points')));
 
                                                // Add points to account
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET points_used=points_used+%s WHERE `id`='%s' LIMIT 1",
-                                               array($POINTS, bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `points_used`=`points_used`+%s WHERE `id`='%s' LIMIT 1",
+                                                       array($POINTS, bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                define('__POINTS' , translateComma($POINTS));
                                                define('__REASON' , REQUEST_POST('reason'));
 
                                                // Send email
-                                               $msg = LOAD_EMAIL_TEMPLATE("sponsor_sub_points", REQUEST_POST('reason'), true);
+                                               $msg = LOAD_EMAIL_TEMPLATE('sponsor_sub_points', REQUEST_POST('reason'), true);
                                                sendEmail(__EMAIL, ADMIN_SPONSOR_SUB_POINTS_SUBJ, $msg);
                                                $message = ADMIN_SPONSOR_POINTS_SUBTRACTED;
                                        } else {
@@ -165,7 +173,7 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                                        }
 
                                        // Convert time selection
-                                       $DATA = array(); $id = "warning_interval_ye"; $skip = false;
+                                       $DATA = array(); $id = 'warning_interval_ye'; $skip = false;
                                        convertSelectionsToTimestamp(REQUEST_POST_ARRAY(), $DATA, $id, $skip);
 
                                        // Save the sponsor
@@ -175,10 +183,10 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                                        REQUEST_POST('gender'          , translateGender(REQUEST_POST('gender')));
                                        REQUEST_POST('warning_interval', createFancyTime(REQUEST_POST('warning_interval')));
 
-                                       if (!$PASS) REQUEST_SET_POST('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
+                                       if ($PASS === false) REQUEST_SET_POST('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
 
                                        // Load email template and send the mail away
-                                       $msg = LOAD_EMAIL_TEMPLATE("admin_sponsor_edit", REQUEST_POST_ARRAY(), false);
+                                       $msg = LOAD_EMAIL_TEMPLATE('admin_sponsor_edit', REQUEST_POST_ARRAY(), false);
                                        sendEmail(REQUEST_POST('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $msg);
                                        break;
 
@@ -194,7 +202,7 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                        } // END - if
                } elseif (isFileReadable(sprintf("%stemplates/%s/html/admin/%s.tpl", constant('PATH'), getLanguage(), $TPL))) {
                        // Create mailto link
-                       define('__SPONSOR_VALUE', "<a href=\"mailto:{!__EMAIL!}\">{!__SURNAME!} {!__FAMILY!}</a>");
+                       define('__SPONSOR_VALUE', "<a href=\"" . generateEmailLink(constant('__EMAIL'), 'sponsor_data') . "\">{!__SURNAME!} {!__FAMILY!}</a>");
 
                        // Load mode template
                        LOAD_TEMPLATE($TPL);
@@ -206,6 +214,9 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('mode'))) {
                // Sponsor not found!
                LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval(REQUEST_GET('id'))));
        }
+
+       // Free result
+       SQL_FREERESULT($result_main);
 } else {
        // Not called by what-list_sponsor.php
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));