X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_holiday.php;h=f2d29b272385a065fa3c245374427a6bb7e8b65d;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=2947ae11293a95b7e4d63dc0960a9af0d141e643;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 2947ae1129..f2d29b2723 100644
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -46,35 +46,35 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('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
-FROM `{?_MYSQL_PREFIX?}_user_holidays` AS h
-LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS d
-ON h.userid=d.userid
-ORDER BY h.userid", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT
+	h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
+FROM
+	`{?_MYSQL_PREFIX?}_user_holidays` AS h
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_user_data` AS d
+ON
+	h.userid=d.userid
+ORDER BY
+	h.userid ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// List all holiday requests
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
-		// Add three dashes to comment when it is empty
-		if (empty($content['comments'])) $content['comments'] = '---';
-
 		// Prepare data for the row template
 		$content = array(
-			'sw'       => $SW,
-			'id'       => $content['id'],
-			'userid'      => generateUserProfileLink($content['userid']),
-			'start'    => generateDateTime($content['holiday_start'], 3),
-			'end'      => generateDateTime($content['holiday_end'], 3),
-			'comments' => wordwrap($content['comments'], 15),
-			'status'   => translateUserStatus($content['status']),
-			'last_online'     => generateDateTime($content['last_online'], 3),
+			'id'          => $content['id'],
+			'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);
-		$SW = 3 - $SW;
-	}
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
@@ -83,7 +83,7 @@ if (SQL_NUMROWS($result) > 0) {
 	loadTemplate('admin_list_holiday', false, $OUT);
 } else {
 	// No holiday requests found
-	loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
 }
 
 // [EOF]