Updated copyright notice as there are changes in this year

[mailer.git] / inc / modules / admin / what-list_holiday.php

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index f2d29b272385a065fa3c245374427a6bb7e8b65d..1ad61cb96ef952c4b98d57711a880330b956f977 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -14,12 +14,10 @@
  * $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                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -40,22 +38,28 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Start listing holiday requests
 $result = SQL_QUERY("SELECT
-       h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
+       `h`.`id`,
+       `h`.`userid`,
+       `h`.`holiday_start`,
+       `h`.`holiday_end`,
+       `h`.`comments`,
+       `d`.`status`,
+       `d`.`last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_holidays` AS h
+       `{?_MYSQL_PREFIX?}_user_holidays` AS `h`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       h.userid=d.userid
+       `h`.`userid`=`d`.`userid`
 ORDER BY
-       h.userid ASC", __FILE__, __LINE__);
+       `h`.`userid` ASC", __FILE__, __LINE__);
 
 if (!SQL_HASZERONUMS($result)) {
        // List all holiday requests
@@ -67,23 +71,22 @@ if (!SQL_HASZERONUMS($result)) {
                        'userid'      => $content['userid'],
                        'start'       => generateDateTime($content['holiday_start'], 3),
                        'end'         => generateDateTime($content['holiday_end'], 3),
-                       'comments'    => wordwrap($content['comments'], 15),
                        'status'      => $content['status'],
                        'last_online' => generateDateTime($content['last_online'], 3),
                );
 
                // Load row template and switch color
-               $OUT .= loadTemplate('admin_list_holiday_row', true, $content);
+               $OUT .= loadTemplate('admin_list_holiday_row', TRUE, $content);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load main template
-       loadTemplate('admin_list_holiday', false, $OUT);
+       loadTemplate('admin_list_holiday', FALSE, $OUT);
 } else {
        // No holiday requests found
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
+       displayMessage('{--ADMIN_LIST_HOLIDAY_404--}');
 }
 
 // [EOF]