A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

[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 713b45fcf497d2fc52ffee346a2e625c70c5ffa1..c883ed6c0c411cad6ef479f4024472e582947ab1 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle Urlaubsschaltungen auflisten                *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                  *
@@ -33,39 +38,37 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('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__);
 
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
        // List all holiday requests
-       $SW = 2; $OUT = "";
-       while (list($id, $uid, $start, $end, $comments, $status, $last) = SQL_FETCHROW($result))
-       {
+       $OUT = ''; $SW = 2;
+       while ($content = SQL_FETCHARRAY($result)) {
                // Add three dashes to comment when it is empty
-               if (empty($comments)) $comments = "---";
+               if (empty($content['comments'])) $content['comments'] = "---";
 
                // Prepare data for the row template
                $content = array(
                        'sw'       => $SW,
-                       'id'       => $id,
-                       'uid'      => ADMIN_USER_PROFILE_LINK($uid),
-                       'start'    => MAKE_DATETIME($start, "3"),
-                       'end'      => MAKE_DATETIME($end, "3"),
-                       'comments' => wordwrap($comments, 15),
-                       'status'   => TRANSLATE_STATUS($status),
-                       'last'     => MAKE_DATETIME($last, "3"),
+                       '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"),
                );
 
                // Load row template and switch color
@@ -75,15 +78,16 @@ if (SQL_NUMROWS($result) > 0)
 
        // Free memory
        SQL_FREERESULT($result);
+
+       // @TODO Rewrite this constant
        define('__HOLIDAY_ROWS', $OUT);
 
        // Load main template
        LOAD_TEMPLATE("admin_list_holiday");
-}
- else
-{
+} else {
        // No holiday requests found
-       LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_ADMIN_NOTHING_FOUND);
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND'));
 }
+
 //
 ?>