X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_holiday.php;h=5b1fe9686ed95cfeba433b52533bde0158efb340;hp=4db1e7553ffcba80d4bed4c31deb4a854a0e78b9;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=a47a9c49a7813304ac78deb3741bdd85e6d50912

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 4db1e7553f..5b1fe9686e 100644
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -47,25 +47,23 @@ 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 +73,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'));
 }
+
 //
 ?>