New wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 0bdd10de82f6abad6011ab6ffcb1cc939b39c6e1..e9e78c92b8ebdc13bada46f49120d7ea1c1f4fe1 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('transfer')) && (!isAdmin())) {

-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('transfer'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('transfer'));

        return;
 } // END - if
 
        return;
 } // END - if
 


@@ -174,7 +174,7 @@ switch ($mode) {
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed

-                               loadTemplate('admin_settings_saved', false, '<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
+                               displayMessage('<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');

                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
                                loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
                                loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');


@@ -242,7 +242,7 @@ switch ($mode) {
                                SQL_FREERESULT($result);
                        } else {
                                // No one else is opt-in
                                SQL_FREERESULT($result);
                        } else {
                                // No one else is opt-in

-                               $OUT = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_ONE_ELSE_OPT_IN--}');
+                               $OUT = displayMessage('{--TRANSFER_NO_ONE_ELSE_OPT_IN--}', true);

                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 
                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 


@@ -264,7 +264,7 @@ switch ($mode) {
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';

-                               $content['captcha_code'] = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_CODE--}');
+                               $content['captcha_code'] = displayMessage('{--TRANSFER_NO_CODE--}', true);

                        }
 
                        // Init points/reason
                        }
 
                        // Init points/reason


@@ -332,7 +332,7 @@ switch ($mode) {
                        // Nothing for in or out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
                        // Nothing for in or out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">

-    ' . loadTemplate('admin_settings_saved', true, $nothingMessage) . '
+    ' . displayMessage($nothingMessage, true) . '

   </td>
 </tr>';
                }
   </td>
 </tr>';
                }


@@ -416,7 +416,7 @@ KEY (`party_userid`)
                        // Nothing for in and out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
                        // Nothing for in and out
                        $OUT = '<tr>
   <td colspan="5" align="center" class="bottom">

-    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '

   </td>
 </tr>';
                }
   </td>
 </tr>';
                }


@@ -477,7 +477,7 @@ KEY (`party_userid`)
                                array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
 
                        // "Settings saved..."
                                array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
 
                        // "Settings saved..."

-                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       displayMessage('{--SETTINGS_SAVED--}');

                } // END - if
 
                // Init entries
                } // END - if
 
                // Init entries