X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_holiday.php;h=e3899b351cae6fac7429e5800f4c0e4875f7d0c1;hp=9845488bc92f2d809b57a9d6b0807c6e8775521e;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hpb=32933a97e4462c232a794fc33bd91f01ff997cb9

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 9845488bc9..e3899b351c 100644
--- 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 - 2012 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,10 +38,10 @@
 // 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
@@ -57,16 +55,12 @@ ON
 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'      => $content['userid'],
 			'start'       => generateDateTime($content['holiday_start'], 3),
@@ -77,18 +71,17 @@ if (SQL_NUMROWS($result) > 0) {
 		);
 
 		// Load row template and switch color
-		$OUT .= loadTemplate('admin_list_holiday_row', true, $content);
-		$SW = 3 - $SW;
+		$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, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND'));
+	displayMessage('{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
 }
 
 // [EOF]