Extension ext-network cleaned up

[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 e3899b351cae6fac7429e5800f4c0e4875f7d0c1..980b3744f783ac183d280ffa8b1954021eaf41cf 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -45,15 +45,21 @@ 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
@@ -65,7 +71,6 @@ 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),
                );
@@ -81,7 +86,7 @@ if (!SQL_HASZERONUMS($result)) {
        loadTemplate('admin_list_holiday', FALSE, $OUT);
 } else {
        // No holiday requests found
-       displayMessage('{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
+       displayMessage('{--ADMIN_LIST_HOLIDAY_404--}');
 }
 
 // [EOF]