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

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 62a2442db8..2583ca37a0 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -14,10 +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 - 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 *
@@ -44,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(generateExtensionInactiveNotInstalledMessage('holiday'));
 	return;
 } // END - if
 
@@ -77,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));
 
@@ -87,8 +86,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 
 	if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
 		// Mail order is to close away!
-		unsetPostRequestElement('ok');
-		unsetPostRequestElement('stop');
+		unsetPostRequestParameter('ok');
+		unsetPostRequestParameter('stop');
 
 		if (($content['timestamp'] + getConfig('holiday_lock')) > time()) {
 			// Mail found in pool
@@ -99,7 +98,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)));
+		displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}');
 		return;
 	}
 } // END - if
@@ -110,18 +109,18 @@ SQL_FREERESULT($result2);
 
 if (isFormSent()) {
 	// Check holiday request...
-	$START = mktime(0, 0, 0, postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
-	$content['holiday_end']   = mktime(0, 0, 0, postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
+	$START = mktime(0, 0, 0, postRequestParameter('start_month'), postRequestParameter('start_day'), postRequestParameter('start_year'));
+	$content['holiday_end']   = mktime(0, 0, 0, postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
 
 	// 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
-		unsetPostRequestElement('ok');
+		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')",
-			array(getMemberId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
+			array(getMemberId(), $START, $content['holiday_end'], postRequestParameter('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
 		SQL_QUERY_ESC("UPDATE
@@ -134,31 +133,31 @@ LIMIT 1",
 			array(getMemberId()), __FILE__, __LINE__);
 
 		// Prepare constants
-		$content['start_day']   = bigintval(postRequestElement('start_day'));
-		$content['start_month'] = $GLOBALS['month_descr'][postRequestElement('start_month')];
-		$content['start_year']  = bigintval(postRequestElement('start_year'));
-		$content['end_day']     = bigintval(postRequestElement('end_day'));
-		$content['end_month']   = $GLOBALS['month_descr'][postRequestElement('end_month')];
-		$content['end_year']    = bigintval(postRequestElement('end_year'));
-		$content['comments']    = secureString(postRequestElement('comments'));
+		$content['start_day']   = bigintval(postRequestParameter('start_day'));
+		$content['start_month'] = $GLOBALS['month_descr'][postRequestParameter('start_month')];
+		$content['start_year']  = bigintval(postRequestParameter('start_year'));
+		$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']    = postRequestParameter('comments');
 
 		// Send mail to member
 		$message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
-		sendEmail(getMemberId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
+		sendEmail(getMemberId(), '{--MEMBER_HOLIDAY_SUBJECT--}', $message);
 
 		// Send mail to all admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
+		sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId());
 
-		// Create task
-		createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
+		// Create task (we ignore the task id here)
+		createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
 		// Display message
-		loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
+		displayMessage('{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}');
 	}
 } // END - if
 
 // Holiday shall be ended now
-if (isPostRequestElementSet('stop')) {
+if (isPostRequestParameterSet('stop')) {
 	// Okay, end the holiday here...
 	$result = SQL_QUERY_ESC("SELECT
 	`holiday_active`, `holiday_activated`
@@ -167,62 +166,74 @@ FROM
 WHERE
 	`userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
-	$content = merge_array($content, SQL_FETCHARRAY($result));
-	SQL_FREERESULT($result);
 
-	if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
-		// Load data
-		$result = SQL_QUERY_ESC("SELECT
+	// Do we have an entry?
+	if (SQL_NUMROWS($result) == 1) {
+		// Merge arrays
+		$content = merge_array($content, SQL_FETCHARRAY($result));
+
+		if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
+			// Load data
+			$result2 = SQL_QUERY_ESC("SELECT
 	`holiday_start`, `holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
-			// Data was found
-			$content = merge_array($content, SQL_FETCHARRAY($result));
-			SQL_FREERESULT($result);
+			if (SQL_NUMROWS($result2) == 1) {
+				// Data was found so merge it
+				$content = merge_array($content, SQL_FETCHARRAY($result2));
 
-			// Prepare it for the template
-			$content['start'] = generateDateTime($content['holiday_start'], 3);
-			$content['end']   = generateDateTime($content['holiday_end']  , 3);
+				// Prepare it for the template
+				$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`
+				// Deactivate it now
+				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET
 	`holiday_active`='N',
 	`holiday_activated`=0
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(getMemberId()), __FILE__, __LINE__);
+					array(getMemberId()), __FILE__, __LINE__);
 
-			// Remove entry
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
+				// Remove entry
+				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(getMemberId()), __FILE__, __LINE__);
-
-			// Send email to admin
-			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'));
-		} else {
-			// Display message to user
-			loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
+					array(getMemberId()), __FILE__, __LINE__);
+
+				// Send email to admin
+				sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
+
+				// Display message to user
+				displayMessage('{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
+			} else {
+				// Display message to user
+				displayMessage('{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}');
+			}
+
+			// Free result
+			SQL_FREERESULT($result2);
+		} elseif ($content['holiday_active'] == 'Y') {
+			// To fast!
+			displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
 		}
-	} elseif ($content['holiday_active'] == 'Y') {
-		// To fast!
-		loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+	} else {
+		// User not found
+		displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
 } // END - if
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isFormSent()) && (!isPostRequestElementSet('stop'))) {
+if ((!isFormSent()) && (!isPostRequestParameterSet('stop'))) {
 	// Check if user is in holiday...
 	$result = SQL_QUERY_ESC("SELECT
 	`holiday_active`, `holiday_activated`
@@ -237,8 +248,7 @@ 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
@@ -249,9 +259,8 @@ WHERE
 	`userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result) == 1) {
-					// Data was found
+					// Data was found so merge it
 					$content = merge_array($content, SQL_FETCHARRAY($result));
-					SQL_FREERESULT($result);
 
 					// Prepare it for the template
 					$content['start'] = generateDateTime($content['holiday_start'] , 3);
@@ -271,35 +280,38 @@ 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;
 				}
+
+				// Free result
+				SQL_FREERESULT($result);
 				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, getMessage('HOLIDAY_MEMBER_LOCKED'));
+		displayMessage('{--MEMBER_HOLIDAY_LOCKED--}');
 	}
 } // END - if