X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_holiday.php;h=0a3d89802f465cc6fa209395b00e1d058f182845;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=d82b42564bf8772aa88f8aa42ce84c549fc6b64f;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index d82b42564b..0a3d89802f 100644
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Urlaubsschaltungen entfernen                     *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,16 +38,16 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+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
@@ -68,58 +68,66 @@ WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
 			// Update user's account
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET holiday_active='N', holiday_activated='0'
+SET `holiday_active`='N', holiday_activated='0'
 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++;
 		}
 	}
-	LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('HOLIDAY_ADMIN_MULTI_DEL'), $cnt));
-} elseif (REQUEST_ISSET_GET(('uid'))) {
+	LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_ADMIN_MULTI_DEL'), $cnt));
+} elseif (REQUEST_ISSET_GET('uid')) {
 	// Set default message
-	$MSG = getMessage('HOLIDAY_ADMIN_SINGLE_404');
+	$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
-		$MSG = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');
+		$message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');
 	}
 
 	// Free memory
 	SQL_FREERESULT($result_load);
 
 	// Output message
-	LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+	LOAD_TEMPLATE('admin_settings_saved', false, $message);
 } else {
 	// Please call me over other scripts... ;)
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
+	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
 }
 
 //