X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=62a2442db86585a054ae8485a82c649adaaa0060;hp=b233e861a4523a6cb18a55599600a0d3b7cd907d;hb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index b233e861a4..62a2442db8 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/24/2004 *
- * ================                             Last change: 07/31/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 07/24/2004 *
+ * ===================                          Last change: 07/31/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-holiday.php                                 *
@@ -63,7 +63,7 @@ WHERE
 	`sender`=%s
 ORDER BY
 	`timestamp` DESC
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats
 $result2 = SQL_QUERY_ESC("SELECT
@@ -74,7 +74,7 @@ WHERE
 	`userid`=%s
 ORDER BY
 	`timestamp_ordered` DESC
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 	// Mail order found!
@@ -82,8 +82,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 	$content = merge_array($content, SQL_FETCHARRAY($result2));
 
 	// Fix missing entries
-	if (empty($content['timestamp'])) $content['timestamp'] = 0;
-	if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = 0;
+	if (empty($content['timestamp'])) $content['timestamp'] = '0';
+	if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = '0';
 
 	if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
 		// Mail order is to close away!
@@ -99,7 +99,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 		}
 
 		// Display message and exit here
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, '1')));
+		loadTemplate('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, 1)));
 		return;
 	}
 } // END - if
@@ -121,7 +121,7 @@ if (isFormSent()) {
 	} else {
 		// Everything went okay so let's store his request and send mails
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')",
-			array(getUserId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
+			array(getMemberId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
 		SQL_QUERY_ESC("UPDATE
@@ -131,7 +131,7 @@ SET
 WHERE
 	`userid`=%s
 LIMIT 1",
-		array(getUserId()), __FILE__, __LINE__);
+			array(getMemberId()), __FILE__, __LINE__);
 
 		// Prepare constants
 		$content['start_day']   = bigintval(postRequestElement('start_day'));
@@ -143,14 +143,14 @@ LIMIT 1",
 		$content['comments']    = secureString(postRequestElement('comments'));
 
 		// Send mail to member
-		$message = loadEmailTemplate('member_holiday_request', $content, getUserId());
-		sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
+		$message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
+		sendEmail(getMemberId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
 
 		// Send mail to all admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getUserId());
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
 
 		// Create task
-		createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getUserId());
+		createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
 		// Display message
 		loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
@@ -166,7 +166,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`userid`=%s
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 	$content = merge_array($content, SQL_FETCHARRAY($result));
 	SQL_FREERESULT($result);
 
@@ -178,15 +178,15 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`userid`=%s
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Data was found
 			$content = merge_array($content, SQL_FETCHARRAY($result));
 			SQL_FREERESULT($result);
 
 			// Prepare it for the template
-			$content['start'] = generateDateTime($content['holiday_start'], '3');
-			$content['end']   = generateDateTime($content['holiday_end']  , '3');
+			$content['start'] = generateDateTime($content['holiday_start'], 3);
+			$content['end']   = generateDateTime($content['holiday_end']  , 3);
 
 			// Deactivate it now
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
@@ -196,7 +196,7 @@ SET
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
+				array(getMemberId()), __FILE__, __LINE__);
 
 			// Remove entry
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
@@ -204,10 +204,10 @@ LIMIT 1",
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
+				array(getMemberId()), __FILE__, __LINE__);
 
 			// Send email to admin
-			sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getUserId());
+			sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
 
 			// Display message to user
 			loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
@@ -230,7 +230,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`userid`=%s
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 	$content = SQL_FETCHARRAY($result);
 	SQL_FREERESULT($result);
 
@@ -247,16 +247,16 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`userid`=%s
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result) == 1) {
 					// Data was found
 					$content = merge_array($content, SQL_FETCHARRAY($result));
 					SQL_FREERESULT($result);
 
 					// Prepare it for the template
-					$content['start'] = generateDateTime($content['holiday_start'] , '3');
-					$content['end']   = generateDateTime($content['holiday_end']   , '3');
-					$content['lock']  = generateDateTime($content['holiday_activated'], '1');
+					$content['start'] = generateDateTime($content['holiday_start'] , 3);
+					$content['end']   = generateDateTime($content['holiday_end']   , 3);
+					$content['lock']  = generateDateTime($content['holiday_activated'], 1);
 
 					// Load template
 					loadTemplate('member_holiday_deactivate', false, $content);
@@ -271,7 +271,7 @@ SET
 	`holiday_active`='N'
 WHERE
 	`userid`=%s
-LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 					redirectToUrl('modules.php?module=login&amp;what=holiday');
 					return;
 				}
@@ -294,7 +294,7 @@ LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 				$content['end_year']  = addSelectionBox('year' , $Y, 'end');
 
 				// Output form
-				loadTemplate('member_holiday_form');
+				loadTemplate('member_holiday_form', false, $content);
 				break;
 		}
 	} else {