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

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index e2894115d2..55e9c729b5 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Urlaubsschaltungen                               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                  *
@@ -47,11 +52,11 @@ 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!
@@ -97,13 +102,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()
 WHERE userid=%s LIMIT 1",
-		 array($GLOBALS['userid']), __FILE__, __LINE__);
+		 array(getUserId()), __FILE__, __LINE__);
 
 		// Prepare constants
 		define('_START_DAY'  , REQUEST_POST('start_day'));
@@ -114,15 +119,15 @@ 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());
+		SEND_EMAIL(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']);
+		SEND_ADMIN_NOTIFICATION(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'));
@@ -134,7 +139,7 @@ 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);
 
@@ -142,7 +147,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	{
 		// 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__);
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
 			// Data was found
@@ -156,14 +161,14 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			// 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__);
+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']);
+			SEND_ADMIN_NOTIFICATION(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'));
@@ -182,7 +187,7 @@ if ((!IS_FORM_SENT()) && (!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);
 
@@ -195,7 +200,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 		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__);
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
 				// Data was found
@@ -218,7 +223,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 				// 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__);
+WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 				LOAD_URL("modules.php?module=login&what=holiday");
 				return;
 			}