X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=a14fa0d6e3a012635a13d8b67c3cb0c07aeddea5;hb=55980dc6bc65fb3c766ff053440a7446962cb85f;hp=5e10287d2f9b267d072c740c707f8da50232a933;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 5e10287d2f..a14fa0d6e3 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die admins-Erweiterung           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,62 +37,64 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
-//
-function HOLIDAY_STOP_HOLIDAYS()
-{
+if (!defined('__SECURITY')) {
+	die();
+} // END - if
+
+// Stops all expired holidays
+function stopHolidays () {
 	// Let's find some expired holiday requests...
-	$result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments
-FROM "._MYSQL_PREFIX."_user_holidays
-WHERE holiday_end <= ".time()."
-ORDER BY userid", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_stop) > 0)
-	{
+	$result_stop = SQL_QUERY("SELECT
+	`userid`, `holiday_start`, `holiday_end`, `comments`
+FROM
+	`{?_MYSQL_PREFIX?}_user_holidays`
+WHERE
+	`holiday_end` <= UNIX_TIMESTAMP()
+ORDER BY
+	`userid` ASC", __FUNCTION__, __LINE__);
+	if (SQL_NUMROWS($result_stop) > 0) {
 		// We foud at least one
-		$admin = "";
-		while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop))
-		{
+		$admin = '';
+		// Init SQLs
+		initSqls();
+
+		// Process all found entries
+		while ($content = SQL_FETCHARRAY($result_stop)) {
 			// Stop holiday
-			$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays WHERE userid=%d LIMIT 1",
-			 array(bigintval($uid)), __FILE__, __LINE__);
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Unlock account
-			$result_del = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET holiday_active='N', holiday_activated='0'
-WHERE userid=%d LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+			addSql(SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`holiday_active`='N', `holiday_activated`=0
+WHERE
+	`userid`=%s
+LIMIT 1",
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Prepare array
 			$content = array(
-				'holiday_end'      => MAKE_DATETIME($end  , "3"),
-				'holiday_start'    => MAKE_DATETIME($start, "3"),
-				'holiday_comments' => $comments
+				'holiday_end'      => generateDateTime($content['holiday_end']  , 3),
+				'holiday_start'    => generateDateTime($content['holiday_start'], 3),
+				'holiday_comments' => $content['comments']
 			);
 
 			// Send mail to user
-			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $uid);
-			SEND_EMAIL($uid, HOLIDAY_MEMBER_UNLOCK_SUBJ, $msg);
+			$message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
+			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
 
 			// Remember userid for admin
-			$admin .= $uid."\n";
-		}
+			$admin .= $content['userid']."\n";
+		} // END - if
 
 		// Send mail to admins
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			// Use new system
-			SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_UNLOCK_SUBJ, "admin_holiday_unlock", $admin, "0");
-		}
-		 else
-		{
-			// Use old system
-			$msg = LOAD_EMAIL_TEMPLATE("admin_holiday_unlock", $admin, "0");
-			SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_UNLOCK_SUBJ, $msg);
-		}
-	}
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin, 0);
+
+		// Run all SQLs
+		runFilterChain('run_sqls');
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_stop);