X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_holiday.php;h=0a3d89802f465cc6fa209395b00e1d058f182845;hb=4e47eb8b83ed2fcd4320aeed8b8c460eb1c8fe4b;hp=e28913976a9583a79912f5edae4a10cc43f71e77;hpb=6e008d188bf9c7f8d4edc2a8799c61940eee48e7;p=mailer.git

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index e28913976a..0a3d89802f 100644
--- 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);
+			$message = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, $uid);
+			sendEmail($uid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
 			$cnt++;
 		}
 	}
@@ -93,20 +93,28 @@ WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 	$message = getMessage('HOLIDAY_ADMIN_SINGLE_404');
 
 	// Fetch data
-	$result_load = SQL_QUERY_ESC("SELECT holiday_start AS start, holiday_end AS end
-FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+	$result_load = SQL_QUERY_ESC("SELECT
+	`holiday_start` AS start, `holiday_end` AS end
+FROM
+	`{!_MYSQL_PREFIX!}_user_holidays`
+WHERE
+	`userid`=%s
+LIMIT 1",
+		array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_load) == 1) {
 		// Load data
 		$content = SQL_FETCHARRAY($result_load);
 
 		// Delete one holiday request (for task)
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
+	`{!_MYSQL_PREFIX!}_user_holidays`
+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);
+		$message = LOAD_EMAIL_TEMPLATE('member_holiday_removed', $content, REQUEST_GET('uid'));
+		sendEmail(REQUEST_GET('uid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
 
 		// Set message
 		$message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');