X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=f4d4dcca5fda7b7944161c93e004d6bb00bdb2bb;hp=701f60d93e8bce553987d04064ac9b098ee8248f;hb=3afdce4fe00b4af570122ce7b8158ced44aec7d3;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 701f60d93e..f4d4dcca5f 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL('modules.php?module=index');
+	redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('holiday')) && (!IS_ADMIN())) {
 	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'holiday'));
 	return;
@@ -79,7 +79,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 		}
 
 		// Display message and exit here
-		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), MAKE_DATETIME($stamp, '1')));
+		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, '1')));
 		return;
 	}
 }
@@ -88,7 +88,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
 	// Check holiday request...
 	$START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
 	$END   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
@@ -101,13 +101,13 @@ if (IS_FORM_SENT()) {
 	} 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, $END, REQUEST_POST('comments')), __FILE__, __LINE__);
+		array(getUserId(), $START, $END, REQUEST_POST('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET `holiday_active`='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
-		 array(getUserId()), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 
 		// Prepare constants
 		define('_START_DAY'  , REQUEST_POST('start_day'));
@@ -119,14 +119,14 @@ WHERE userid=%s LIMIT 1",
 
 		// Send mail to member
 		$msg = LOAD_EMAIL_TEMPLATE('member_holiday_request', REQUEST_POST('comments'), getUserId());
-		SEND_EMAIL(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $msg);
+		sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $msg);
 
 		// Send mail to all admins
-		SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', REQUEST_POST('comments'), getUserId());
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', REQUEST_POST('comments'), getUserId());
 
 		// Create task
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','{--HOLIDAY_ADMIN_SUBJECT--}','%s', UNIX_TIMESTAMP())",
-			array(getUserId(), $msg), __FILE__, __LINE__);
+		array(getUserId(), $msg), __FILE__, __LINE__);
 
 		// Display message
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
@@ -134,7 +134,7 @@ WHERE userid=%s LIMIT 1",
 }
 
 // Holiday shall be ended now
-if (REQUEST_ISSET_POST(('stop'))) {
+if (REQUEST_ISSET_POST('stop')) {
 	// Okay, end the holiday here...
 	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
@@ -151,8 +151,8 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 			SQL_FREERESULT($result);
 
 			// Prepare it for the template
-			define('__HOLIDAY_START', MAKE_DATETIME($start, "3"));
-			define('__HOLIDAY_END'  , MAKE_DATETIME($end  , "3"));
+			define('__HOLIDAY_START', generateDateTime($start, '3'));
+			define('__HOLIDAY_END'  , generateDateTime($end  , '3'));
 
 			// Deactivate it now
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
@@ -164,7 +164,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 			// Send email to admin
-			SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', array(), getUserId());
+			sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', array(), getUserId());
 
 			// Display message to user
 			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
@@ -179,7 +179,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 }
 
 // If something is wrong or link in menu is just clicked display form
-if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST(('stop'))) {
+if ((!isFormSent()) && (!REQUEST_ISSET_POST('stop'))) {
 	// Check if user is in holiday...
 	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
@@ -191,57 +191,57 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 		// User can deactivate his holiday request
 		switch ($active)
 		{
-		case 'Y': // Display deactivation form
-			// Load starting and ending date
-			$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
+			case 'Y': // Display deactivation form
+				// Load starting and ending date
+				$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
-				// Data was found
-				list($start, $end) = SQL_FETCHROW($result);
-				SQL_FREERESULT($result);
-
-				// Prepare it for the template
-				define('__HOLIDAY_START', MAKE_DATETIME($start , '3'));
-				define('__HOLIDAY_END'  , MAKE_DATETIME($end   , '3'));
-				define('__HOLIDAY_LOCK' , MAKE_DATETIME($locked, '1'));
-
-				// Load template
-				LOAD_TEMPLATE('member_holiday_deactivate');
-			} else {
-				// Free memory
-				SQL_FREERESULT($result);
-
-				// Remove entry and reload URL
-				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+				if (SQL_NUMROWS($result) == 1) {
+					// Data was found
+					list($start, $end) = SQL_FETCHROW($result);
+					SQL_FREERESULT($result);
+
+					// Prepare it for the template
+					define('__HOLIDAY_START', generateDateTime($start , '3'));
+					define('__HOLIDAY_END'  , generateDateTime($end   , '3'));
+					define('__HOLIDAY_LOCK' , generateDateTime($locked, '1'));
+
+					// Load template
+					LOAD_TEMPLATE('member_holiday_deactivate');
+				} else {
+					// Free memory
+					SQL_FREERESULT($result);
+
+					// Remove entry and reload URL
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET `holiday_active`='N'
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
-				LOAD_URL('modules.php?module=login&what=holiday');
-				return;
-			}
-			break;
-
-		case 'N': // Display activation form
-			// Starting day
-			define('_START_DAY'  , ADD_SELECTION('day'  , date('d', (time() + getConfig('one_day'))), 'start'));
-			define('_START_MONTH', ADD_SELECTION('month', date('m', (time() + getConfig('one_day'))), 'start'));
-			define('_START_YEAR' , ADD_SELECTION('year' , date('Y', (time() + getConfig('one_day'))), 'start'));
-
-			// 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')));
-
-			// Ending day
-			define('_END_DAY'  , ADD_SELECTION('day'  , $D, 'end'));
-			define('_END_MONTH', ADD_SELECTION('month', $M, 'end'));
-			define('_END_YEAR' , ADD_SELECTION('year' , $Y, 'end'));
-
-			// Copy value from configuration
-			define('__HOLIDAY_MAX', getConfig('holiday_max'));
-
-			// Output form
-			LOAD_TEMPLATE('member_holiday_form');
-			break;
+					redirectToUrl('modules.php?module=login&what=holiday');
+					return;
+				}
+				break;
+
+			case 'N': // Display activation form
+				// Starting day
+				define('_START_DAY'  , ADD_SELECTION('day'  , date('d', (time() + getConfig('one_day'))), 'start'));
+				define('_START_MONTH', ADD_SELECTION('month', date('m', (time() + getConfig('one_day'))), 'start'));
+				define('_START_YEAR' , ADD_SELECTION('year' , date('Y', (time() + getConfig('one_day'))), 'start'));
+
+				// 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')));
+
+				// Ending day
+				define('_END_DAY'  , ADD_SELECTION('day'  , $D, 'end'));
+				define('_END_MONTH', ADD_SELECTION('month', $M, 'end'));
+				define('_END_YEAR' , ADD_SELECTION('year' , $Y, 'end'));
+
+				// Copy value from configuration
+				define('__HOLIDAY_MAX', getConfig('holiday_max'));
+
+				// Output form
+				LOAD_TEMPLATE('member_holiday_form');
+				break;
 		}
 	} else {
 		// To fast!