X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=11f17185ff880fc79bb6666a71077a1ecc989b1b;hp=42144cd8d9934d834708128753655f008274a473;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hpb=ae80e170b5d25a4782af90a7c3d81fbb176fa293

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 42144cd8d9..11f17185ff 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                  *
@@ -32,245 +37,270 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+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");
-}
- elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
+} elseif (!IS_MEMBER()) {
+	redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('holiday')) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('holiday'));
 	return;
 }
 
+// Init content array
+$content = array();
+
 // Add description as navigation point
-ADD_DESCR("member", basename(__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__);
+$result1 = SQL_QUERY_ESC("SELECT
+	`timestamp`
+FROM
+	`{!_MYSQL_PREFIX!}_pool`
+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__);
-
-if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
-{
+$result2 = SQL_QUERY_ESC("SELECT
+	`timestamp_ordered`
+FROM
+	`{!_MYSQL_PREFIX!}_user_stats`
+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!
-	list($stamp1) = SQL_FETCHROW($result1);
-	list($stamp2) = SQL_FETCHROW($result2);
-	if (empty($stamp1)) $stamp1 = 0;
-	if (empty($stamp2)) $stamp2 = 0;
+	$content = merge_array($content, SQL_FETCHARRAY($result1));
+	$content = merge_array($content, SQL_FETCHARRAY($result2));
 
-	if ((($stamp1 + $_CONFIG['holiday_lock']) > time()) || (($stamp2 + $_CONFIG['holiday_lock']) > time()))
-	{
+	// Fix missing entries
+	if (empty($content['timestamp'])) $content['timestamp'] = 0;
+	if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = 0;
+
+	if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
 		// Mail order is to close away!
-		unset($_POST['ok']);
-		unset($_POST['stop']);
+		REQUEST_UNSET_POST('ok');
+		REQUEST_UNSET_POST('stop');
 
-		if (($stamp1 + $_CONFIG['holiday_lock']) > time())
-		{
+		if (($content['timestamp'] + getConfig('holiday_lock')) > time()) {
 			// Mail found in pool
-			$stamp = $stamp1;
-		}
-		 else
-		{
+			$stamp = $content['timestamp'];
+		} else {
 			// Mail found in stats
-			$stamp = $stamp2;
+			$stamp = $content['timestamp_ordered'];
 		}
 
 		// Display message and exit here
-		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_ORDER_1.MAKE_DATETIME($stamp, "1").HOLIDAY_MEMBER_ORDER_2);
+		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, '1')));
 		return;
 	}
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 
-if (isset($_POST['ok']))
-{
+if (isFormSent()) {
 	// Check holiday request...
-	$START = mktime(0, 0, 0, $_POST['start_month'], $_POST['start_day'], $_POST['start_year']);
-	$END   = mktime(0, 0, 0, $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
+	$START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
+	$content['holiday_end']   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
 
 	// Test both values
-	$TEST = $END - $START;
-	if (($TEST < 0) || ($TEST > (ONE_DAY * $_CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
-	{
+	$TEST = $content['holiday_end'] - $START;
+	if (($TEST < 0) || ($TEST > (getConfig('one_day') * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
 		// Time test failed
-		unset($_POST['ok']);
-	}
-	 else
-	{
+		REQUEST_UNSET_POST('ok');
+	} else {
 		// Everything went okay so let's store his request and send mails
-		$result = 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, $_POST['comments']), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')",
+			array(getUserId(), $START, $content['holiday_end'], REQUEST_POST('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET holiday_active='N', holiday_activated=UNIX_TIMESTAMP()
-WHERE userid=%s LIMIT 1",
-		 array($GLOBALS['userid']), __FILE__, __LINE__);
+		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__);
 
 		// Prepare constants
-		define('_START_DAY'  , $_POST['start_day']);
-		define('_START_MONTH', $MONTH_DESCR[$_POST['start_month']]);
-		define('_START_YEAR' , $_POST['start_year']);
-		define('_END_DAY'    , $_POST['end_day']);
-		define('_END_MONTH'  , $MONTH_DESCR[$_POST['end_month']]);
-		define('_END_YEAR'   , $_POST['end_year']);
+		define('_START_DAY'  , REQUEST_POST('start_day'));
+		define('_START_MONTH', $GLOBALS['month_descr'][REQUEST_POST('start_month')]);
+		define('_START_YEAR' , REQUEST_POST('start_year'));
+		define('_END_DAY'    , REQUEST_POST('end_day'));
+		define('_END_MONTH'  , $GLOBALS['month_descr'][REQUEST_POST('end_month')]);
+		define('_END_YEAR'   , REQUEST_POST('end_year'));
 
 		// Send mail to member
-		$msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-		SEND_EMAIL($GLOBALS['userid'], HOLIDAY_MEMBER_SUBJECT, $msg);
+		$message = LOAD_EMAIL_TEMPLATE('member_holiday_request', REQUEST_POST('comments'), getUserId());
+		sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
 
 		// Send mail to all admins
-		$msg = LOAD_EMAIL_TEMPLATE("admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', REQUEST_POST('comments'), getUserId());
 
 		// Create task
-		$result = 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', '%s', '%s', UNIX_TIMESTAMP())",
-		 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, addslashes($msg)), __FILE__, __LINE__);
+		createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getUserId());
 
 		// Display message
-		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_IS_ACTIVATED_NOW);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
 	}
-}
+} // END - if
 
 // Holiday shall be ended now
-if (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__);
-	list($active, $locked) = SQL_FETCHROW($result);
+	$result = SQL_QUERY_ESC("SELECT
+	`holiday_active`, `holiday_activated`
+FROM
+	`{!_MYSQL_PREFIX!}_user_data`
+WHERE
+	`userid`=%s
+LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+	$content = merge_array($content, SQL_FETCHARRAY($result));
 	SQL_FREERESULT($result);
 
-	if (($active == "Y") && (($locked + $_CONFIG['holiday_lock']) < time()))
-	{
+	if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + 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)
-		{
+		$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);
+			$content = merge_array($content, SQL_FETCHARRAY($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($content['holiday_start'], '3'));
+			define('__HOLIDAY_END'  , generateDateTime($content['holiday_end']  , '3'));
 
 			// Deactivate it now
-			$result = 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__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+SET
+	`holiday_active`='N',
+	`holiday_activated`=0
+WHERE
+	`userid`=%s
+LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 			// Remove entry
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
+	`{!_MYSQL_PREFIX!}_user_holidays`
+WHERE
+	`userid`=%s
+LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 
 			// Send email to admin
-			SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
+			sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', array(), getUserId());
 
 			// Display message to user
-			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);
-		}
-		 else
-		{
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
+		} else {
 			// Display message to user
-			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_CANNOT_DEACTIVATE);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
 		}
-	}
-	 elseif ($active == "Y")
-	{
+	} elseif ($content['holiday_active'] == 'Y') {
 		// To fast!
-		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
 	}
-}
+} // END - if
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isset($_POST['ok'])) && (!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__);
-	list($active, $locked) = SQL_FETCHROW($result);
+	$result = SQL_QUERY_ESC("SELECT
+	`holiday_active`, `holiday_activated`
+FROM
+	`{!_MYSQL_PREFIX!}_user_data`
+WHERE
+	`userid`=%s
+LIMIT 1", array(getUserId()), __FILE__, __LINE__);
+	$content = SQL_FETCHARRAY($result);
 	SQL_FREERESULT($result);
 
 	// Check for lock
-	if (($locked + $_CONFIG['holiday_lock']) < time())
-	{
+	if (($content['holiday_activated'] + getConfig('holiday_lock')) < time()) {
 		// User can deactivate his holiday request
-		switch ($active)
+		switch ($content['holiday_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
-				$result = 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() + ONE_DAY)), "start"));
-			define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + ONE_DAY)), "start"));
-			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + ONE_DAY)), "start"));
-
-			// Calcualte ending date
-			$D = date("d", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
-			$M = date("m", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
-			$Y = date('Y', time() + ONE_DAY + (ONE_DAY * $_CONFIG['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', $_CONFIG['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
+					$content = merge_array($content, SQL_FETCHARRAY($result));
+					SQL_FREERESULT($result);
+
+					// Prepare it for the template
+					define('__HOLIDAY_START', generateDateTime($content['holiday_start'] , '3'));
+					define('__HOLIDAY_END'  , generateDateTime($content['holiday_end']   , '3'));
+					define('__HOLIDAY_LOCK' , generateDateTime($content['holiday_activated'], '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
-	{
+	} else {
 		// To fast!
-		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
 	}
-}
-//
+} // END - if
+
+// [EOF]
 ?>