From 9e17fa354142359ef3cacb5db25a14ce482d1163 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Tue, 8 May 2018 22:45:19 +0700
Subject: [PATCH 1/2] Clean up UserlogsHelper

---
 .../com_userlogs/helpers/userlogs.php         | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/administrator/components/com_userlogs/helpers/userlogs.php b/administrator/components/com_userlogs/helpers/userlogs.php
index 1c0c8b135b1d5..2cd3908c628a9 100644
--- a/administrator/components/com_userlogs/helpers/userlogs.php
+++ b/administrator/components/com_userlogs/helpers/userlogs.php
@@ -19,7 +19,7 @@ class UserlogsHelper
 	/**
 	 * Method to extract data array of objects into CSV file
 	 *
-	 * @param   array  $data  Has the data to be exported
+	 * @param   array $data The logs data to be exported
 	 *
 	 * @return  void
 	 *
@@ -27,9 +27,8 @@ class UserlogsHelper
 	 */
 	public static function dataToCsv($data)
 	{
-		$date = JFactory::getDate();
+		$date     = JFactory::getDate();
 		$filename = "logs_" . $date;
-		$data = json_decode(json_encode($data), true);
 
 		$app = JFactory::getApplication();
 		$app->setHeader('Content-Type', 'application/csv', true)
@@ -45,10 +44,16 @@ public static function dataToCsv($data)
 
 		fputcsv($fp, $headers);
 
-		foreach ($data as $log)
+		foreach ($data as $row)
 		{
-			$app->triggerEvent('onLogMessagePrepare', array (&$log['message'], $log['extension']));
-			$log['ip_address'] = JText::_($log['ip_address']);
+			$log               = array();
+			$log['id']         = $row->id;
+			$log['message']    = $row->message;
+			$log['log_date']   = $row->log_date;
+			$log['extension']  = $row->extension;
+			$log['user_id']    = $row->user_id;
+			$log['ip_address'] = JText::_($row->ip_address);
+			$app->triggerEvent('onLogMessagePrepare', array(&$log['message'], $log['extension']));
 			$log['extension'] = self::translateExtensionName(strtoupper(strtok($log['extension'], '.')));
 
 			fputcsv($fp, $log, ',');
@@ -87,7 +92,7 @@ public static function translateExtensionName($extension)
 	 *
 	 * @param   string   $context  The context of the content
 	 *
-	 * @return  mixed  An array of parameters, or false on error.
+	 * @return  mixed  An object contain type parameters, or null if not found
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -101,14 +106,7 @@ public static function getLogMessageParams($context)
 
 		$db->setQuery($query);
 
-		$items = $db->loadObjectList();
-
-		if (empty($items))
-		{
-			return false;
-		}
-
-		return $items[0];
+		return $db->loadObject();
 	}
 
 	/**
@@ -128,6 +126,11 @@ public static function getDataByPks($pks, $field, $tableType, $tablePrefix = 'JT
 		$items = array();
 		$table = JTable::getInstance($tableType, $tablePrefix);
 
+		if ($table === false)
+		{
+			return $items;
+		}
+
 		foreach ($pks as $pk)
 		{
 			if ($table->load($pk))

From 475fbb434852af91cb8b6f3244f231d3135e0837 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Wed, 9 May 2018 07:00:03 +0700
Subject: [PATCH 2/2] Better code

---
 .../components/com_userlogs/helpers/userlogs.php   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_userlogs/helpers/userlogs.php b/administrator/components/com_userlogs/helpers/userlogs.php
index 2cd3908c628a9..3ab9cfca5847f 100644
--- a/administrator/components/com_userlogs/helpers/userlogs.php
+++ b/administrator/components/com_userlogs/helpers/userlogs.php
@@ -44,17 +44,13 @@ public static function dataToCsv($data)
 
 		fputcsv($fp, $headers);
 
-		foreach ($data as $row)
+		foreach ($data as $log)
 		{
-			$log               = array();
-			$log['id']         = $row->id;
-			$log['message']    = $row->message;
-			$log['log_date']   = $row->log_date;
-			$log['extension']  = $row->extension;
-			$log['user_id']    = $row->user_id;
-			$log['ip_address'] = JText::_($row->ip_address);
+			$log               = (array) $log;
+			$log['ip_address'] = JText::_($log['ip_address']);
+			$log['extension']  = self::translateExtensionName(strtoupper(strtok($log['extension'], '.')));
+
 			$app->triggerEvent('onLogMessagePrepare', array(&$log['message'], $log['extension']));
-			$log['extension'] = self::translateExtensionName(strtoupper(strtok($log['extension'], '.')));
 
 			fputcsv($fp, $log, ',');
 		}