Removed comment introduced by Profi-Concept, this comment should fine (in a much...

[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..ed25e6dafdda29d71dd79e605100e54540352c38 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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 *
@@ -39,13 +38,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) {
@@ -59,8 +58,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`
@@ -69,7 +67,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
@@ -79,25 +77,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_DELETE', $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
-       `holiday_start` AS start, `holiday_end` AS end
+       `holiday_start` AS start, `holiday_end` AS `end`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -117,11 +116,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);
@@ -129,8 +128,8 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
        // Output message
        loadTemplate('admin_settings_saved', false, $message);
 } else {
-       // Please call me over other scripts... ;)
-       loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
+       // Add member selection box
+       addMemberSelectionBox();
 }
 
 // [EOF]