X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=9797991f8169df9e700dd5548b04c05f7dec4b5d;hp=e2894115d2ad6d5c9a6f5908152b9a63b2b17e19;hb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;hpb=d32a5a6c4e9287611853e7187a5d6d1b05794bdb

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index e2894115d2..9797991f81 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Urlaubsschaltungen                               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,25 +38,25 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "holiday");
+	redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('holiday')) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('holiday'));
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // Check for running mail orders in pool
 $result1 = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool`
-WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats
 $result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM `{!_MYSQL_PREFIX!}_user_stats`
-WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 	// Mail order found!
@@ -74,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;
 	}
 }
@@ -83,8 +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')  );
@@ -97,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($GLOBALS['userid'], $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()
+SET `holiday_active`='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
-		 array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 
 		// Prepare constants
 		define('_START_DAY'  , REQUEST_POST('start_day'));
@@ -114,142 +118,134 @@ WHERE userid=%s LIMIT 1",
 		define('_END_YEAR'   , REQUEST_POST('end_year'));
 
 		// Send mail to member
-		$msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", REQUEST_POST('comments'), $GLOBALS['userid']);
-		SEND_EMAIL($GLOBALS['userid'], getMessage('HOLIDAY_MEMBER_SUBJECT'), $msg);
+		$msg = LOAD_EMAIL_TEMPLATE('member_holiday_request', REQUEST_POST('comments'), getUserId());
+		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'), $GLOBALS['userid']);
+		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($GLOBALS['userid'], $msg), __FILE__, __LINE__);
+		array(getUserId(), $msg), __FILE__, __LINE__);
 
 		// Display message
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
 	}
 }
 
 // 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($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if (($active == "Y") && (($locked + getConfig('holiday_lock')) < time()))
-	{
+	if (($active == 'Y') && (($locked + getConfig('holiday_lock')) < time())) {
 		// Load data
 		$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+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_START', generateDateTime($start, '3'));
+			define('__HOLIDAY_END'  , generateDateTime($end  , '3'));
 
 			// Deactivate it now
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET holiday_active='N', holiday_activated='0'
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+SET `holiday_active`='N', holiday_activated='0'
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 			// Remove entry
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __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(), $GLOBALS['userid']);
+			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'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
 		} else {
 			// Display message to user
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
 		}
-	} elseif ($active == "Y") {
+	} elseif ($active == 'Y') {
 		// To fast!
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
 	}
 }
 
 // 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($GLOBALS['userid']), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
 	// Check for lock
-	if (($locked + getConfig('holiday_lock')) < time())
-	{
+	if (($locked + getConfig('holiday_lock')) < time()) {
 		// 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`
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __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`
-SET holiday_active='N'
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-				LOAD_URL("modules.php?module=login&amp;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;
+			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', 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__);
+					redirectToUrl('modules.php?module=login&amp;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!
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
 	}
 }
 //