Way more usage of EL code:

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

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 22867b557f0072f19ba732422f3a0be0455ac081..2583ca37a076e2b4d593864581626f1ae536462c 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('holiday')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('holiday'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('holiday'));
        return;
 } // END - if
 
@@ -76,7 +76,7 @@ ORDER BY
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
-       // Mail order found!
+       // Mail order found
        $content = merge_array($content, SQL_FETCHARRAY($result1));
        $content = merge_array($content, SQL_FETCHARRAY($result2));
 
@@ -98,7 +98,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
                }
 
                // Display message and exit here
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, 1)));
+               displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}');
                return;
        }
 } // END - if
@@ -139,7 +139,7 @@ LIMIT 1",
                $content['end_day']     = bigintval(postRequestParameter('end_day'));
                $content['end_month']   = $GLOBALS['month_descr'][postRequestParameter('end_month')];
                $content['end_year']    = bigintval(postRequestParameter('end_year'));
-               $content['comments']    = secureString(postRequestParameter('comments'));
+               $content['comments']    = postRequestParameter('comments');
 
                // Send mail to member
                $message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
@@ -152,7 +152,7 @@ LIMIT 1",
                createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
                // Display message
-               loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}');
+               displayMessage('{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}');
        }
 } // END - if
 
@@ -211,21 +211,21 @@ LIMIT 1",
                                sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
                                // Display message to user
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
+                               displayMessage('{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
                        } else {
                                // Display message to user
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}');
+                               displayMessage('{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}');
                        }
 
                        // Free result
                        SQL_FREERESULT($result2);
                } elseif ($content['holiday_active'] == 'Y') {
                        // To fast!
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_LOCKED--}');
+                       displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
+               displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
        }
 
        // Free result
@@ -311,7 +311,7 @@ LIMIT 1",
                } // END - switch
        } else {
                // To fast!
-               loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_LOCKED--}');
+               displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
        }
 } // END - if