New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

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

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 10f9907e76f3d94e1ba8c3209df12290b9f4f51f..3f199c71d82f25b1e181a3cbd54711fda8da9b83 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -43,12 +43,10 @@ if (!defined('__SECURITY')) {
 } elseif (!isMember()) {
        // User is not logged in
        redirectToIndexMemberOnlyModule();
-}
-
-// Is the refback system enabled?
-if (getConfig('refback_enabled') != 'Y') {
+} elseif (getConfig('refback_enabled') != 'Y') {
        // Output message
-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_DISABLED'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_DISABLED--}');
+
        // Abort here
        return false;
 } // END - if
@@ -76,13 +74,13 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) {
                        // Check status
                        if (isset($status['ok'])) {
                                // No message found
-                               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_DONE'));
+                               loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_DONE--}');
                        } elseif (isset($status['message'])) {
                                // Something went wrong with error message
                                loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_REFBACK_ERROR_MESSAGE', $status['message']));
                        } else {
                                // No message found
-                               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_ERROR_EMPTY_MESSAGE'));
+                               loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_ERROR_EMPTY_MESSAGE--}');
                        }
                } else {
                        // Percents out-of-bounds ;-)
@@ -94,24 +92,20 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) {
                // Read data from refback table
                $content = getArrayFromUserRefbackData(postRequestParameter('id'));
 
-               // Translate comma
-               $content['refback'] = translateComma($content['refback']);
-
                // Load form for editing
                loadTemplate('member_refback_edit', false, $content);
        }
 } // END - if
 
 // Load all referal levels
-$result = SQL_QUERY_ESC("SELECT
+$result = SQL_QUERY('SELECT
        r.level, r.percents
 FROM
        `{?_MYSQL_PREFIX?}_refdepths` AS r
 WHERE
        r.level > 0
 ORDER BY
-       r.level ASC",
-       array(getMemberId()), __FILE__, __LINE__);
+       r.level ASC', __FILE__, __LINE__);
 
 // Are there some entries? (Shall be!)
 if (SQL_NUMROWS($result) > 0) {
@@ -120,7 +114,7 @@ if (SQL_NUMROWS($result) > 0) {
        while ($content = SQL_FETCHARRAY($result)) {
                // Init variables
                $rows = '';
-               $counter = '0';
+               $content['counter'] = 0;
                $SW = 2;
 
                // Check for users ref in this level
@@ -131,11 +125,8 @@ if (SQL_NUMROWS($result) > 0) {
 
                        // Add/"translate" more content
                        $refRow['sw']          = $SW;
-                       $refRow['points']      = translateComma($refRow['points']);
-                       $refRow['refback']     = translateComma($refRow['refback']);
-                       // UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
+                       // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
                        $refRow['joined']      = generateDateTime($refRow['joined'], '3');
-                       if (empty($refRow['nickname'])) $refRow['nickname'] = '---';
 
                        // Load row template
                        if ($deleted === true) {
@@ -145,14 +136,12 @@ if (SQL_NUMROWS($result) > 0) {
                        }
 
                        // Count this ref and switch color
-                       $counter++;
+                       $content['counter']++;
                        $SW = 3 - $SW;
                } // END - foreach
 
                // Remember the content
-               $content['counter']  = translateComma($counter);
-               $content['percents'] = translateComma($content['percents']);
-               $content['rows']     = $rows;
+               $content['rows'] = $rows;
 
                // Load level template
                $OUT .= loadTemplate('member_refback_list_level', true, $content);
@@ -162,11 +151,11 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('member_refback_list', false, $OUT);
 } else {
        // No entries
-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_NO_ENTRIES'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_NO_ENTRIES--}');
 }
 
 // Free result
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>