Possible further fix for #128

[mailer.git] / inc / modules / member / what-primera.php

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 23f6823ce24e5f369ad94f31fcf94b02542a3c36..deff292584e75a051cb4a1792b2644108892267f 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -38,14 +38,14 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
        // User is not logged in
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('primera')) && (!IS_ADMIN())) {
        // Extension 'primera' is not activated
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'primera');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('primera'));
        return;
 }
 
@@ -53,7 +53,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Check if the admin has entered the data
-if ((getConfig('primera_api_name') == "") || (getConfig('primera_api_md5') == "")) {
+if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) {
        // Something important is missing...
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_API_DATA_MISSING'));
        return;
@@ -63,13 +63,13 @@ if ((getConfig('primera_api_name') == "") || (getConfig('primera_api_md5') == ""
 $content = array(); $points = false;
 
 // Is the mode set (payout only)
-if (!REQUEST_ISSET_GET(('mode'))) {
+if (!REQUEST_ISSET_GET('mode')) {
        // Get referal id
        $content['refid'] = getConfig(('primera_refid'));
 
        // Get Primus id
        $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 
        // Are there some entries?
        if (SQL_NUMROWS($result) == 1) {
@@ -81,21 +81,21 @@ if (!REQUEST_ISSET_GET(('mode'))) {
        SQL_FREERESULT($result);
 
        // Is there an ID?
-       if ((!empty($content['primera_nickname'])) && (!REQUEST_ISSET_GET(('mode')))) {
+       if ((!empty($content['primera_nickname'])) && (!REQUEST_ISSET_GET('mode'))) {
                // Then use an other "mode"
                REQUEST_SET_GET('mode', "list");
 
                // And load all rows!
                $result = SQL_QUERY_ESC("SELECT `id`,`primera_account`,`primera_amount`,`primera_timestamp`,`primera_type` FROM `{!_MYSQL_PREFIX!}_user_primera` WHERE `userid` = %s ORDER BY `primera_timestamp` DESC",
-                       array(getUserId()), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);
 
                // Load all rows
                $content['rows'] = ''; $SW = 2;
                while ($data = SQL_FETCHARRAY($result)) {
                        // Prepare data for output
                        $rowContent = array(
-                               'stamp'         => MAKE_DATETIME($data['primera_timestamp'], "2"),
-                               'points'                => TRANSLATE_COMMA($data['primera_amount']),
+                               'stamp'         => generateDateTime($data['primera_timestamp'], '2'),
+                               'points'                => translateComma($data['primera_amount']),
                                'acc'           => SQL_ESCAPE($data['primera_account']),
                                'status'                => PRIMERA_TRANSFER_STATUS($data['primera_type']),
                                'raw_type'      => strtolower($data['primera_type']),
@@ -119,7 +119,7 @@ if (REQUEST_GET('mode') == "pay") {
        $points = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
 
        // No dots here...
-       $points = explode(".", $points);
+       $points = explode('.', $points);
        $points = bigintval($points[0]);
 
        // Remove the registration fee
@@ -128,18 +128,18 @@ if (REQUEST_GET('mode') == "pay") {
        // Is this enougth for a payout?
        if ($points < getConfig('primera_min_payout')) {
                // No, then abort here
-               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'), TRANSLATE_COMMA(getConfig('primera_min_payout'))));
+               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'), translateComma(getConfig('primera_min_payout'))));
                return;
        }
 
        // Add points to content array
        $content['points']              = $points;
-       $content['min_points']  = TRANSLATE_COMMA(getConfig('primera_min_payout'));
+       $content['min_points']  = translateComma(getConfig('primera_min_payout'));
 
        // Get Primera id
        $content['primera_nickname'] = '';
        $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 
        // Are there some entries?
        if (SQL_NUMROWS($result) == 1) {
@@ -151,12 +151,12 @@ if (REQUEST_GET('mode') == "pay") {
        SQL_FREERESULT($result);
 } else {
        // Invalid mode!
-       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), REQUEST_GET(('mode'))));
+       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), REQUEST_GET('mode')));
        return;
 }
 
 // Is the formular sent?
-if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
+if ((isFormSent()) && (REQUEST_ISSET_GET('mode'))) {
        // Check input data depending on the mode and execute the requested mode
        switch (REQUEST_GET('mode')) {
                case "pay": // Payout this exchange -> Primus
@@ -187,7 +187,7 @@ if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
                                        $locked = true;
 
                                        // Shall I "pay" the referal points imidiately?
-                                       if (getConfig('ref_payout') == "0") {
+                                       if (getConfig('ref_payout') == '0') {
                                                // Yes, "pay" it now
                                                $locked = false;
                                        } // END - if
@@ -197,7 +197,7 @@ if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
 
                                        // Update primera nickname
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
-                                               array(REQUEST_POST('primera_nickname'), getUserId()), __FILE__, __LINE__);
+                                       array(REQUEST_POST('primera_nickname'), getUserId()), __FILE__, __LINE__);
 
                                        // All done!
                                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_PAYOUT_DONE'));
@@ -214,13 +214,13 @@ if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
 
                default: // Invalid mode!
                        DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", REQUEST_GET('mode')));
-                       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), REQUEST_GET(('mode'))));
+                       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), REQUEST_GET('mode')));
                        return;
        }
 } // END - if
 
 // Prepare mode for template name
-$mode = sprintf("member_primera_mode_%s", REQUEST_GET(('mode')));
+$mode = sprintf("member_primera_mode_%s", REQUEST_GET('mode'));
 
 // Load the template
 LOAD_TEMPLATE($mode, false, $content);