X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_holiday.php;h=3425519e1bb92be70f16f925f1c297d8197be06f;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=4ce7616761f4029f8374940006e3a374a3416ace;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 4ce7616761..3425519e1b 100644
--- 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 = 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
@@ -118,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);
@@ -131,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]