New wrapper functions introduced, TODOs.txt updated

[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 d23b431eb17f23fd06ae34973a31f6d0db8e34c4..a3883d9fb9b373cea0cbe713a1092baa197905c9 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -14,11 +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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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),
@@ -78,7 +72,6 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_holiday_row', true, $content);
-               $SW = 3 - $SW;
        } // END - while
 
        // Free memory
@@ -88,7 +81,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_holiday', false, $OUT);
 } else {
        // No holiday requests found
-       loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ADMIN_NOTHING_FOUND--}');
+       displayMessage('{--ADMIN_HOLIDAY_NOTHING_FOUND--}');
 }
 
 // [EOF]