X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_holiday.php;h=0dc684b1498ee2a040bf33bddbefc142a7e6ae15;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hp=013e97ca474e86b4b9bfa42dc0e40aa77351421f;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 013e97ca47..0dc684b149 100644
--- 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                  *
@@ -32,36 +37,38 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__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, "._MYSQL_PREFIX."_user_data AS d WHERE h.userid=d.userid ORDER BY h.userid", __FILE__, __LINE__);
+$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__);
 
-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'      => generateUserProfileLink($content['userid']),
+			'start'    => generateDateTime($content['holiday_start'], '3'),
+			'end'      => generateDateTime($content['holiday_end'], '3'),
+			'comments' => wordwrap($content['comments'], 15),
+			'status'   => translateUserStatus($content['status']),
+			'last'     => generateDateTime($content['last_online'], '3'),
 		);
 
 		// Load row template and switch color
@@ -71,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'));
 }
+
 //
 ?>