The table 'network_translations' is now a static table maintained in the database

[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 19d0175533b210e126a398192b55714ca7328b6f..3425519e1bb92be70f16f925f1c297d8197be06f 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -40,13 +40,13 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 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) {
@@ -60,8 +60,7 @@ WHERE
 LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data and free memory
-                       list($userid, $start, $end) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
+                       $content = SQL_FETCHARRAY($result);
 
                        // Update user's account
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
@@ -70,7 +69,7 @@ SET
        `holiday_activated`=0
 WHERE
        `userid`=%s
-LIMIT 1", array(bigintval($userid)), __FILE__, __LINE__);
+LIMIT 1", array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                        // Remove holiday
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
@@ -80,25 +79,26 @@ WHERE
 LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
-                       $content = array(
-                               'start' => generateDateTime($start, 3),
-                               'end'   => generateDateTime($end  , 3)
-                       );
+                       $content['holiday_start'] = generateDateTime($content['holiday_start'], 3);
+                       $content['holiday_end']   = generateDateTime($content['holiday_end']  , 3);
 
                        // Send email to user
-                       $message = loadEmailTemplate('member_holiday_removed', $content, $userid);
-                       sendEmail($userid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+                       $message = loadEmailTemplate('member_holiday_removed', $content, $content['userid']);
+                       sendEmail($content['userid'], '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
                        $cnt++;
-               }
-       }
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
+               } // END - if
+
+               // Free result
+               SQL_FREERESULT($result);
+       } // END - foreach
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DEL', $cnt));
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
-       $message = '{--HOLIDAY_ADMIN_SINGLE_404--}';
+       $message = '{--ADMIN_HOLIDAY_SINGLE_404--}';
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT
-       `holiday_start` AS start, `holiday_end` AS end
+       `holiday_start` AS start, `holiday_end` AS `end`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -118,10 +118,10 @@ 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 = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}';
+               $message = '{--ADMIN_HOLIDAY_SINGLE_DELETED--}';
        } // END - if
 
        // Free memory