X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=43cfb88d2fded032f90bd42d7bad50392a4629c6;hb=7cfec287d338c5b3af01b1a79881302505b3a795;hp=209ad00787beb478c9d39f52260ac0e82ec1ea6f;hpb=aa1fa67e62e0d175d5d801becaea4362a5b50e2a;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 209ad00787..43cfb88d2f 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -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)));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, 1)));
 		return;
 	}
 } // END - if
@@ -145,16 +143,16 @@ LIMIT 1",
 
 		// 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'));
+		loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
 	}
 } // END - if
 
@@ -210,24 +208,24 @@ LIMIT 1",
 					array(getMemberId()), __FILE__, __LINE__);
 
 				// Send email to admin
-				sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
+				sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
 				// Display message to user
-				loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
 			} else {
 				// Display message to user
-				loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}');
 			}
 
 			// Free result
 			SQL_FREERESULT($result2);
 		} elseif ($content['holiday_active'] == 'Y') {
 			// To fast!
-			loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+			loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_LOCKED--}');
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_MEMBER_NOT_STOPPED_404', getMemberId()));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
 	}
 
 	// Free result
@@ -293,20 +291,19 @@ 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() + getConfig('ONE_DAY');
+				$endingStamp   = $startingStamp + (getConfig('ONE_DAY') * 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);
@@ -314,7 +311,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 		}
 	} else {
 		// To fast!
-		loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+		loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_LOCKED--}');
 	}
 } // END - if