X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=d33be517cd9ac0af16783ec84487538b99c1f975;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=63a5ed54b22720520a0d29b06ce106adb06e0740;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 63a5ed54b2..d33be517cd 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -100,7 +100,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 +145,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
 
@@ -168,58 +168,70 @@ 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
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
+			} else {
+				// Display message to user
+				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, '{--MEMBER_HOLIDAY_LOCKED--}');
 		}
-	} elseif ($content['holiday_active'] == 'Y') {
-		// To fast!
-		loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+	} else {
+		// User not found
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
 } // END - if
 
 // If something is wrong or link in menu is just clicked display form
@@ -250,9 +262,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);
@@ -276,23 +287,25 @@ 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() + 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);
@@ -300,7 +313,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