X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_holiday.php;h=d38a768182a9bb18b7ec8de101a0d2b2f0016cf8;hp=6361bd3fa2f65c9025cf776306c579f988ea251e;hb=682edce003a1a91f66fb8e2212d7fdb591379843;hpb=fc162164725588cf75969f707faead9c9cd8e68b

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 6361bd3fa2..d38a768182 100644
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -40,15 +38,15 @@
 // 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';
+	$count = '0';
 	foreach (postRequestParameter('sel') as $id => $sel) {
 		// Get the userid
 		$result = SQL_QUERY_ESC("SELECT
@@ -60,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`
@@ -70,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
@@ -80,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, '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
-			$cnt++;
-		}
-	}
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
+			$message = loadEmailTemplate('member_holiday_removed', $content, $content['userid']);
+			sendEmail($content['userid'], '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message);
+			$count++;
+		} // END - if
+
+		// Free result
+		SQL_FREERESULT($result);
+	} // END - foreach
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DELETE', $count));
 } 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 +116,10 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
 		// Send email to user
 		$message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
-		sendEmail(getRequestParameter('userid'), '{--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
@@ -130,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, '{--HOLIDAY_NO_DIRECT_CALL--}');
+	// Add member selection box
+	addMemberSelectionBox();
 }
 
 // [EOF]