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 b557952b0d90cce9bbeed0cc4ffa806fae5ea5fd..51bb307ccc5b793778efcbf456b260db9cf64a99 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -44,12 +44,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Start listing holiday requests
-$result = SQL_QUERY("SELECT
-       h.`id`,
-       h.`userid`,
-       h.`holiday_start`,
-       h.`holiday_end`,
-       h.`comments`,
+$result = sqlQuery("SELECT
+       `h`.`id`,
+       `h`.`userid`,
+       `h`.`holiday_start`,
+       `h`.`holiday_end`,
+       `h`.`comments`,
        `d`.`status`,
        `d`.`last_online`
 FROM
@@ -57,14 +57,14 @@ FROM
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       h.`userid`=`d`.`userid`
+       `h`.`userid`=`d`.`userid`
 ORDER BY
-       h.`userid` ASC", __FILE__, __LINE__);
+       `h`.`userid` ASC", __FILE__, __LINE__);
 
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
        // List all holiday requests
        $OUT = '';
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Prepare data for the row template
                $content = array(
                        'id'          => $content['id'],
@@ -80,7 +80,7 @@ if (!SQL_HASZERONUMS($result)) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Load main template
        loadTemplate('admin_list_holiday', FALSE, $OUT);