More rewrites, and output-mode fixed (we should documentate this)

[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 ce20c453c49c03073990d4f32e98b04fbff6f574..c128d55096906890c782c0f81bf14230b6d476e5 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,18 +37,17 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+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
+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__);
 
@@ -63,31 +62,28 @@ if (SQL_NUMROWS($result) > 0) {
                $content = array(
                        'sw'       => $SW,
                        'id'       => $content['id'],
-                       'uid'      => ADMIN_USER_PROFILE_LINK($content['userid']),
-                       'start'    => MAKE_DATETIME($content['holiday_start'], "3"),
-                       'end'      => MAKE_DATETIME($content['holiday_end'], "3"),
+                       'userid'      => generateUserProfileLink($content['userid']),
+                       'start'    => generateDateTime($content['holiday_start'], 3),
+                       'end'      => generateDateTime($content['holiday_end'], 3),
                        'comments' => wordwrap($content['comments'], 15),
-                       'status'   => TRANSLATE_STATUS($content['status']),
-                       'last'     => MAKE_DATETIME($content['last_online'], "3"),
+                       'status'   => translateUserStatus($content['status']),
+                       'last_online'     => generateDateTime($content['last_online'], 3),
                );
 
                // Load row template and switch color
-               $OUT .= LOAD_TEMPLATE("admin_list_holiday_row", true, $content);
+               $OUT .= loadTemplate('admin_list_holiday_row', true, $content);
                $SW = 3 - $SW;
        }
 
        // Free memory
        SQL_FREERESULT($result);
 
-       // @TODO Rewrite this constant
-       define('__HOLIDAY_ROWS', $OUT);
-
        // Load main template
-       LOAD_TEMPLATE("admin_list_holiday");
+       loadTemplate('admin_list_holiday', false, $OUT);
 } else {
        // No holiday requests found
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND'));
+       loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND'));
 }
 
-//
+// [EOF]
 ?>