X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_holiday.php;h=7435c85ec3c830e3cd59a2a15c618eba1b209364;hb=eb301334eb0960dd060cc0d59e6021260a41f835;hp=07c0775ede6e2cfef19619dc8f4f25385cca20eb;hpb=ae798f7e416793adf24a3b87024df1027e520ce2;p=mailer.git

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 07c0775ede..7435c85ec3 100644
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,89 +37,93 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Check for selected holidays
 $SUM = 0;
-if (REQUEST_ISSET_POST('sel')) $SUM = SELECTION_COUNT(REQUEST_POST('sel'));
+if (isPostRequestElementSet('sel')) $SUM = countPostSelection();
 
 // Shall I delete selected holidays???
-if ($SUM > 0)
-{
+if ($SUM > 0) {
 	// Delete multiple holiday requests (for list_holiday)
 	$cnt = 0;
-	foreach (REQUEST_POST('sel') as $id => $sel)
-	{
+	foreach (postRequestElement('sel') as $id => $sel) {
 		// 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__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+FROM `{?_MYSQL_PREFIX?}_user_holidays`
+WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
+		if (SQL_NUMROWS($result) == 1) {
 			// Load data and free memory
-			list($uid, $start, $end) = SQL_FETCHROW($result);
+			list($userid, $start, $end) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 
 			// Update user's account
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET holiday_active='N', holiday_activated='0'
-WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
+SET `holiday_active`='N', holiday_activated='0'
+WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __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__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays`
+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 = loadEmailTemplate('member_holiday_removed', $content, $userid);
+			sendEmail($userid, 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'))) {
+	loadTemplate('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_ADMIN_MULTI_DEL'), $cnt));
+} elseif (isGetRequestElementSet('userid')) {
 	// 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(getRequestElement('userid'))), __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(getRequestElement('userid'))), __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 = loadEmailTemplate('member_holiday_removed', $content, getRequestElement('userid'));
+		sendEmail(getRequestElement('userid'), 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);
+	loadTemplate('admin_settings_saved', false, $message);
 } else {
 	// Please call me over other scripts... ;)
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
+	loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
 }
 
 //