Naming convention, internal TODOs solved:

[mailer.git] / inc / modules / admin / what-del_holiday.php

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 86fbe698c2e736b83741604f209ff9c11302d930..55b4d6159e3644b69de2a0735e1db9badf3c2112 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,7 +46,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Shall I delete selected holidays???
-if (countPostSelection() > 0) {
+if (ifPostContainsSelections()) {
        // Delete multiple holiday requests (for list_holiday)
        $cnt = '0';
        foreach (postRequestParameter('sel') as $id => $sel) {
@@ -86,14 +87,14 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_removed', $content, $userid);
-                       sendEmail($userid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+                       sendEmail($userid, '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
                        $cnt++;
                }
        }
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DEL', $cnt));
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
-       $message = getMessage('HOLIDAY_ADMIN_SINGLE_404');
+       $message = '{--ADMIN_HOLIDAY_SINGLE_404--}';
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT
@@ -117,11 +118,11 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
                // Send email to user
                $message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
-               sendEmail(getRequestParameter('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+               sendEmail(getRequestParameter('userid'), '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
 
                // Set message
-               $message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');
-       }
+               $message = '{--ADMIN_HOLIDAY_SINGLE_DELETED--}';
+       } // END - if
 
        // Free memory
        SQL_FREERESULT($result_load);
@@ -130,7 +131,7 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
        loadTemplate('admin_settings_saved', false, $message);
 } else {
        // Please call me over other scripts... ;)
-       loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
+       loadTemplate('admin_settings_saved', false, '{--HOLIDAY_NO_DIRECT_CALL--}');
 }
 
 // [EOF]