New naming convention applied to many functions, see #118 for details

[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 e28913976a9583a79912f5edae4a10cc43f71e77..c1f8af8e7649d2a3a75a6496de0df9803deb6f78 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -47,7 +47,7 @@ ADD_DESCR('admin', __FILE__);
 
 // Check for selected holidays
 $SUM = 0;
-if (REQUEST_ISSET_POST('sel')) $SUM = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SUM = countPostSelection();
 
 // Shall I delete selected holidays???
 if ($SUM > 0)
@@ -59,7 +59,7 @@ if ($SUM > 0)
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end
 FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
+WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load data and free memory
@@ -73,17 +73,17 @@ WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Remove holiday
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
+WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
                        $content = array(
-                               'start' => MAKE_DATETIME($start, "3"),
-                               'end'   => MAKE_DATETIME($end  , "3")
+                               'start' => generateDateTime($start, "3"),
+                               'end'   => generateDateTime($end  , "3")
                        );
 
                        // Send email to user
                        $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, $uid);
-                       SEND_EMAIL($uid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
+                       sendEmail($uid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
                        $cnt++;
                }
        }
@@ -106,7 +106,7 @@ WHERE userid=%s LIMIT 1", array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE
 
                // Send email to user
                $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, REQUEST_GET('uid'));
-               SEND_EMAIL(REQUEST_GET('uid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
+               sendEmail(REQUEST_GET('uid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
 
                // Set message
                $message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');