X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=2df58e320cb409c3506d8f996ff6aada42c89fa9;hb=ea2a5e6a7838127d2f9dec02ba68ec575188528b;hp=6b58f029af390d611f453b4087976a18514dc7da;hpb=e1653405d28923c78b2e292125306ccf61138f24;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 6b58f029af..2df58e320c 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -39,7 +39,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 }
  elseif (!IS_LOGGED_IN())
 {
-	LOAD_URL(URL."/modules.php?module=index");
+	LOAD_URL("modules.php?module=index");
 }
  elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
 {
@@ -52,11 +52,11 @@ ADD_DESCR("member", basename(__FILE__));
 
 // Check for running mail orders in pool
 $result1 = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool
-WHERE sender=%d ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats
 $result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM "._MYSQL_PREFIX."_user_stats
-WHERE userid=%d ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 {
@@ -66,13 +66,13 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 	if (empty($stamp1)) $stamp1 = 0;
 	if (empty($stamp2)) $stamp2 = 0;
 
-	if ((($stamp1 + $CONFIG['holiday_lock']) > time()) || (($stamp2 + $CONFIG['holiday_lock']) > time()))
+	if ((($stamp1 + $_CONFIG['holiday_lock']) > time()) || (($stamp2 + $_CONFIG['holiday_lock']) > time()))
 	{
 		// Mail order is to close away!
 		unset($_POST['ok']);
 		unset($_POST['stop']);
 
-		if (($stamp1 + $CONFIG['holiday_lock']) > time())
+		if (($stamp1 + $_CONFIG['holiday_lock']) > time())
 		{
 			// Mail found in pool
 			$stamp = $stamp1;
@@ -101,7 +101,7 @@ if (isset($_POST['ok']))
 
 	// Test both values
 	$TEST = $END - $START;
-	if (($TEST < 0) || ($TEST > (ONE_DAY * $CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
+	if (($TEST < 0) || ($TEST > (ONE_DAY * $_CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
 	{
 		// Time test failed
 		unset($_POST['ok']);
@@ -115,7 +115,7 @@ if (isset($_POST['ok']))
 		// Activate holiday system
 		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N', holiday_activated=UNIX_TIMESTAMP()
-WHERE userid=%d LIMIT 1",
+WHERE userid=%s LIMIT 1",
 		 array($GLOBALS['userid']), __FILE__, __LINE__);
 
 		// Prepare constants
@@ -132,14 +132,7 @@ WHERE userid=%d LIMIT 1",
 
 		// Send mail to all admins
 		$msg = LOAD_EMAIL_TEMPLATE("admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-		}
-		 else
-		{
-			SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_SUBJECT, $msg);
-		}
+		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
 		// Create task
 		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'HOLIDAY_REQUEST', '%s', '%s', UNIX_TIMESTAMP())",
@@ -155,15 +148,15 @@ if (isset($_POST['stop']))
 {
 	// Okay, end the holiday here...
 	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if (($active == 'Y') && (($locked + $CONFIG['holiday_lock']) < time()))
+	if (($active == "Y") && (($locked + $_CONFIG['holiday_lock']) < time()))
 	{
 		// Load data
 		$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
 			// Data was found
@@ -177,22 +170,14 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			// Deactivate it now
 			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N', holiday_activated='0'
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 			// Remove entry
 			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 			// Send email to admin
-			if (GET_EXT_VERSION("admins") >= "0.4.1")
-			{
-				SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
-			}
-			 else
-			{
-				$msg = LOAD_EMAIL_TEMPLATE("admin_holiday_deactivated", "", $GLOBALS['userid']);
-				SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_DEAC_SUBJ, $msg);
-			}
+			SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
 
 			// Display message to user
 			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);
@@ -203,7 +188,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_CANNOT_DEACTIVATE);
 		}
 	}
-	 elseif ($active == 'Y')
+	 elseif ($active == "Y")
 	{
 		// To fast!
 		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED);
@@ -215,12 +200,12 @@ if ((!isset($_POST['ok'])) && (!isset($_POST['stop'])))
 {
 	// Check if user is in holiday...
 	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
 	// Check for lock
-	if (($locked + $CONFIG['holiday_lock']) < time())
+	if (($locked + $_CONFIG['holiday_lock']) < time())
 	{
 		// User can deactivate his holiday request
 		switch ($active)
@@ -228,7 +213,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 		case 'Y': // Display deactivation form
 			// Load starting and ending date
 			$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
 				// Data was found
@@ -251,8 +236,8 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 				// Remove entry and reload URL
 				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N'
-WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-				LOAD_URL(URL."/modules.php?module=login&amp;what=holiday");
+WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+				LOAD_URL("modules.php?module=login&amp;what=holiday");
 				return;
 			}
 			break;
@@ -264,9 +249,9 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + ONE_DAY)), "start"));
 
 			// Calcualte ending date
-			$D = date("d", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
-			$M = date("m", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
-			$Y = date('Y', time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
+			$D = date("d", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
+			$M = date("m", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
+			$Y = date('Y', time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
 
 			// Ending day
 			define('_END_DAY'  , ADD_SELECTION("day"  , $D, "end"));
@@ -274,7 +259,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			define('_END_YEAR' , ADD_SELECTION("year" , $Y, "end"));
 
 			// Copy value from configuration
-			define('__HOLIDAY_MAX', $CONFIG['holiday_max']);
+			define('__HOLIDAY_MAX', $_CONFIG['holiday_max']);
 
 			// Output form
 			LOAD_TEMPLATE("member_holiday_form");