Naming convention applied, new wrapper introduced:

[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 fcfa29aefd879c8a10ff89d3a3c4ae0f825fdce9..0900fcb3deed790044fe08a261afeee7ddc9117f 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 (!isRefbackEnabled()) {
        // 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 ;-)
@@ -110,14 +108,13 @@ ORDER BY
        r.level ASC', __FILE__, __LINE__);
 
 // Are there some entries? (Shall be!)
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // List all levels
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Init variables
                $rows = '';
                $content['counter'] = 0;
-               $SW = 2;
 
                // Check for users ref in this level
                foreach (getArrayFromRefbackUserRefs(getMemberId(), $content['level']) as $refRow) {
@@ -126,10 +123,8 @@ if (SQL_NUMROWS($result) > 0) {
                        if (is_null($refRow['status'])) $deleted = true;
 
                        // Add/"translate" more content
-                       $refRow['sw']          = $SW;
                        // @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) {
@@ -140,7 +135,6 @@ if (SQL_NUMROWS($result) > 0) {
 
                        // Count this ref and switch color
                        $content['counter']++;
-                       $SW = 3 - $SW;
                } // END - foreach
 
                // Remember the content
@@ -154,7 +148,7 @@ 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