X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=7417a7dec32dbd3eaa1758c39664456d6edf632b;hp=ef2b99b8f4ae0e82ef5020cd96ce2c5816ee889a;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index ef2b99b8f4..7417a7dec3 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,10 +43,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('holiday')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('holiday'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=holiday%}');
 	return;
 } // END - if
 
@@ -78,7 +76,7 @@ ORDER BY
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
-	// Mail order found!
+	// Mail order found
 	$content = merge_array($content, SQL_FETCHARRAY($result1));
 	$content = merge_array($content, SQL_FETCHARRAY($result2));
 
@@ -100,7 +98,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 		}
 
 		// Display message and exit here
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_MEMBER_ORDER', generateDateTime($stamp, 1)));
+		displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}');
 		return;
 	}
 } // END - if
@@ -116,12 +114,12 @@ if (isFormSent()) {
 
 	// Test both values
 	$TEST = $content['holiday_end'] - $START;
-	if (($TEST < 0) || ($TEST > (getConfig('ONE_DAY') * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
+	if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
 		// Time test failed
 		unsetPostRequestParameter('ok');
 	} 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')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`,`holiday_start`,`holiday_end`,`comments`) VALUES ('%s','%s','%s','%s')",
 			array(getMemberId(), $START, $content['holiday_end'], postRequestParameter('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
@@ -141,11 +139,11 @@ LIMIT 1",
 		$content['end_day']     = bigintval(postRequestParameter('end_day'));
 		$content['end_month']   = $GLOBALS['month_descr'][postRequestParameter('end_month')];
 		$content['end_year']    = bigintval(postRequestParameter('end_year'));
-		$content['comments']    = secureString(postRequestParameter('comments'));
+		$content['comments']    = postRequestParameter('comments');
 
 		// Send mail to member
 		$message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
-		sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message);
+		sendEmail(getMemberId(), '{--MEMBER_HOLIDAY_SUBJECT--}', $message);
 
 		// Send mail to all admins
 		sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId());
@@ -154,7 +152,7 @@ LIMIT 1",
 		createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
 		// Display message
-		loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
+		displayMessage('{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}');
 	}
 } // END - if
 
@@ -162,7 +160,7 @@ LIMIT 1",
 if (isPostRequestParameterSet('stop')) {
 	// Okay, end the holiday here...
 	$result = SQL_QUERY_ESC("SELECT
-	`holiday_active`, `holiday_activated`
+	`holiday_active`,`holiday_activated`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -177,7 +175,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 		if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
 			// Load data
 			$result2 = SQL_QUERY_ESC("SELECT
-	`holiday_start`, `holiday_end`
+	`holiday_start`,`holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -213,21 +211,21 @@ LIMIT 1",
 				sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
 				// Display message to user
-				loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}');
+				displayMessage('{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
 			} else {
 				// Display message to user
-				loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_CANNOT_DEACTIVATE--}');
+				displayMessage('{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}');
 			}
 
 			// Free result
 			SQL_FREERESULT($result2);
 		} elseif ($content['holiday_active'] == 'Y') {
 			// To fast!
-			loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}');
+			displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_MEMBER_NOT_STOPPED_404', getMemberId()));
+		displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
 	}
 
 	// Free result
@@ -238,7 +236,7 @@ LIMIT 1",
 if ((!isFormSent()) && (!isPostRequestParameterSet('stop'))) {
 	// Check if user is in holiday...
 	$result = SQL_QUERY_ESC("SELECT
-	`holiday_active`, `holiday_activated`
+	`holiday_active`,`holiday_activated`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -250,12 +248,11 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 	// Check for lock
 	if (($content['holiday_activated'] + getConfig('holiday_lock')) < time()) {
 		// User can deactivate his holiday request
-		switch ($content['holiday_active'])
-		{
+		switch ($content['holiday_active']) {
 			case 'Y': // Display deactivation form
 				// Load starting and ending date
 				$result = SQL_QUERY_ESC("SELECT
-	`holiday_start`, `holiday_end`
+	`holiday_start`,`holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -283,7 +280,8 @@ SET
 	`holiday_active`='N'
 WHERE
 	`userid`=%s
-LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
+LIMIT 1",
+						array(getMemberId()), __FILE__, __LINE__);
 					redirectToUrl('modules.php?module=login&amp;what=holiday');
 					return;
 				}
@@ -293,28 +291,27 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 				break;
 
 			case 'N': // Display activation form
-				// Starting day
-				$content['start_day']   = addSelectionBox('day'  , date('d', (time() + getConfig('ONE_DAY'))), 'start');
-				$content['start_month'] = addSelectionBox('month', date('m', (time() + getConfig('ONE_DAY'))), 'start');
-				$content['start_year']  = addSelectionBox('year' , date('Y', (time() + getConfig('ONE_DAY'))), 'start');
+				// Cache timestamps
+				$startingStamp = time() + getOneDay();
+				$endingStamp   = $startingStamp + (getOneDay() * getConfig('holiday_max'));
 
-				// Calcualte ending date
-				$D = date('d', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max')));
-				$M = date('m', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max')));
-				$Y = date('Y', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max')));
+				// Starting day
+				$content['start_day']   = addSelectionBox('day'  , getDay($startingStamp)  , 'start');
+				$content['start_month'] = addSelectionBox('month', getMonth($startingStamp), 'start');
+				$content['start_year']  = addSelectionBox('year' , getYear($startingStamp) , 'start');
 
 				// Ending day
-				$content['end_day']   = addSelectionBox('day'  , $D, 'end');
-				$content['end_month'] = addSelectionBox('month', $M, 'end');
-				$content['end_year']  = addSelectionBox('year' , $Y, 'end');
+				$content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end');
+				$content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
+				$content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 
 				// Output form
 				loadTemplate('member_holiday_form', false, $content);
 				break;
-		}
+		} // END - switch
 	} else {
 		// To fast!
-		loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}');
+		displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
 	}
 } // END - if