Renamed function so it might be more understandable

[mailer.git] / inc / libs / holiday_functions.php

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index dd8a45bb6594a00886977098b4cd2ecc15d9037a..5fe06735de477a959be3945268e7804d7d4a8922 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -52,9 +51,10 @@ WHERE
        `holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
        `userid` ASC", __FUNCTION__, __LINE__);
-       if (SQL_NUMROWS($result_stop) > 0) {
+       if (!SQL_HASZERONUMS($result_stop)) {
                // We foud at least one
                $admin = '';
+
                // Init SQLs
                initSqls();
 
@@ -75,22 +75,22 @@ LIMIT 1",
                                array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
                        // Prepare array
-                       $content = array(
+                       $content = merge_array($content, array(
                                'holiday_end'      => generateDateTime($content['holiday_end']  , 3),
                                'holiday_start'    => generateDateTime($content['holiday_start'], 3),
                                'holiday_comments' => $content['comments']
-                       );
+                       ));
 
                        // Send mail to user
                        $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+                       sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
                        $admin .= $content['userid']."\n";
                } // END - if
 
                // Send mail to admins
-               sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin, 0);
+               sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin);
 
                // Run all SQLs
                runFilterChain('run_sqls');
@@ -100,5 +100,5 @@ LIMIT 1",
        SQL_FREERESULT($result_stop);
 }
 
-//
+// [EOF]
 ?>