Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[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 c883ed6c0c411cad6ef479f4024472e582947ab1..51bb307ccc5b793778efcbf456b260db9cf64a99 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/24/2004 *
- * ================                             Last change: 08/01/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 07/24/2004 *
+ * ===================                          Last change: 08/01/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_holiday.php                            *
@@ -14,11 +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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2015 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 *
@@ -37,57 +36,58 @@
  ************************************************************************/
 
 // 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();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+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
-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 = sqlQuery("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 (!ifSqlHasZeroNumRows($result)) {
        // List all holiday requests
-       $OUT = ''; $SW = 2;
-       while ($content = SQL_FETCHARRAY($result)) {
-               // Add three dashes to comment when it is empty
-               if (empty($content['comments'])) $content['comments'] = "---";
-
+       $OUT = '';
+       while ($content = sqlFetchArray($result)) {
                // Prepare data for the row template
                $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"),
-                       'comments' => wordwrap($content['comments'], 15),
-                       'status'   => TRANSLATE_STATUS($content['status']),
-                       'last'     => MAKE_DATETIME($content['last_online'], "3"),
+                       'id'          => $content['id'],
+                       'userid'      => $content['userid'],
+                       'start'       => generateDateTime($content['holiday_start'], 3),
+                       'end'         => generateDateTime($content['holiday_end'], 3),
+                       'status'      => $content['status'],
+                       'last_online' => generateDateTime($content['last_online'], 3),
                );
 
                // Load row template and switch color
-               $OUT .= LOAD_TEMPLATE("admin_list_holiday_row", true, $content);
-               $SW = 3 - $SW;
-       }
+               $OUT .= loadTemplate('admin_list_holiday_row', TRUE, $content);
+       } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
-
-       // @TODO Rewrite this constant
-       define('__HOLIDAY_ROWS', $OUT);
+       sqlFreeResult($result);
 
        // 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'));
+       displayMessage('{--ADMIN_LIST_HOLIDAY_404--}');
 }
 
-//
+// [EOF]
 ?>