New naming convention applied to many functions, see #118 for details

[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 f0cde3f762975400f64b840868975bb3b53c6170..747d4728a58412ea065d18dca6cf4059eae61488 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -45,9 +45,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
-if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
+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",
+       $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) {
                // Load sponsor details
@@ -97,7 +97,7 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
                define('__URL'        , $DATA['url']);
                //  Warning because low points
                define('__REC_WARNING', ADD_SELECTION('yn', $DATA['receive_warnings'], "receive_warning"));
-               define('__INTERVAL'   , CREATE_TIME_SELECTIONS($DATA['warning_interval'], "warning_interval", "MWDh"));
+               define('__INTERVAL'   , createTimeSelections($DATA['warning_interval'], "warning_interval", "MWDh"));
 
                // Init variables here
                $TPL = sprintf("admin_edit_sponsor_%s", REQUEST_GET(('mode')));
@@ -111,19 +111,19 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
                        case "add_points": // Add points
                                if (strval(REQUEST_POST('points')) > 0) {
                                        // Replace german decimal comma with computer's decimal dot
-                                       $POINTS = strval(REVERT_COMMA(REQUEST_POST('points')));
+                                       $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",
+                                       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' , TRANSLATE_COMMA($POINTS));
+                                       define('__POINTS' , translateComma($POINTS));
                                        define('__REASON' , REQUEST_POST('reason'));
 
                                        // Send email
                                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_add_points", REQUEST_POST('reason'), true);
-                                       SEND_EMAIL(__EMAIL, ADMIN_SPONSOR_ADD_POINTS_SUBJ, $msg);
+                                       sendEmail(__EMAIL, ADMIN_SPONSOR_ADD_POINTS_SUBJ, $msg);
                                        $message = ADMIN_SPONSOR_POINTS_ADDED;
                                } else {
                                        // No points entered to add!
@@ -134,19 +134,19 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
                        case "sub_points": // Subtract points
                                if (strval(REQUEST_POST('points')) > 0) {
                                        // Replace german decimal comma with computer's decimal dot
-                                       $POINTS = strval(REVERT_COMMA(REQUEST_POST('points')));
+                                       $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",
+                                       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' , TRANSLATE_COMMA($POINTS));
+                                       define('__POINTS' , translateComma($POINTS));
                                        define('__REASON' , REQUEST_POST('reason'));
 
                                        // Send email
                                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_sub_points", REQUEST_POST('reason'), true);
-                                       SEND_EMAIL(__EMAIL, ADMIN_SPONSOR_SUB_POINTS_SUBJ, $msg);
+                                       sendEmail(__EMAIL, ADMIN_SPONSOR_SUB_POINTS_SUBJ, $msg);
                                        $message = ADMIN_SPONSOR_POINTS_SUBTRACTED;
                                } else {
                                        // No points entered to add!
@@ -154,7 +154,7 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
                                }
                                break;
 
-                       case "edit": // Edit sponsor account
+                       case 'edit': // Edit sponsor account
                                $PASS = true;
                                if ((REQUEST_POST('pass1') != REQUEST_POST('pass2')) || ((!REQUEST_ISSET_POST(('pass1'))) && (!REQUEST_ISSET_POST(('pass1'))))) {
                                        // Remove passwords
@@ -165,20 +165,20 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
 
                                // Convert time selection
                                $DATA = array(); $id = "warning_interval_ye"; $skip = false;
-                               CONVERT_SELECTIONS_TO_TIMESTAMP(REQUEST_POST_ARRAY(), $DATA, $id, $skip);
+                               convertSelectionsToTimestamp(REQUEST_POST_ARRAY(), $DATA, $id, $skip);
 
                                // Save the sponsor
                                SPONSOR_HANDLE_SPONSOR(REQUEST_POST_ARRAY());
 
                                // Convert some data for the email template
-                               REQUEST_POST('gender'          , TRANSLATE_GENDER(REQUEST_POST('gender')));
-                               REQUEST_POST('warning_interval', CREATE_FANCY_TIME(REQUEST_POST('warning_interval')));
+                               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'));
 
                                // Load email template and send the mail away
                                $msg = LOAD_EMAIL_TEMPLATE("admin_sponsor_edit", REQUEST_POST_ARRAY(), false);
-                               SEND_EMAIL(REQUEST_POST('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $msg);
+                               sendEmail(REQUEST_POST('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $msg);
                                break;
 
                        default: // Unknown mode
@@ -191,7 +191,7 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
                                // Output message
                                LOAD_TEMPLATE('admin_settings_saved', false, $message);
                        } // END - if
-               } elseif (FILE_READABLE(sprintf("%stemplates/%s/html/admin/%s.tpl", constant('PATH'), GET_LANGUAGE(), $TPL))) {
+               } 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>");