Merge pull request #157 from techjoomla/release-1.1.2

Merge `Release 1.1.2` into `master`

tjreports/administrator/access.xml

@@ -13,6 +13,7 @@
 		<action name="core.viewall" title="JACTION_VIEWALL" description="COM_TJREPORTS_ACCESS_VIEWALL_DESC" />
 		<action name="core.view.own" title="JACTION_VIEW_OWN" description="COM_TJREPORTS_ACCESS_VIEW_OWN_DESC" />
 		<action name="core.view.subscribe" title="JACTION_VIEW_SUBSCRIBE" description="COM_TJREPORTS_ACCESS_VIEW_SUBSCRIBE_DESC" />
+		<action name="core.view.piidata" title="COM_TJREPORTS_ACCESS_PIIDATA" description="COM_TJREPORTS_ACCESS_PIIDATA_COMPONENT_DESC" />
 	</section>
 
 	<section name="tjreport">

tjreports/administrator/models/tjreport.php

@@ -173,14 +173,25 @@ public function getReportPluginData($pluginId, $pluginName = null)
 			JModelLegacy::addIncludePath(JPATH_SITE . '/plugins/tjreports/' . $pluginName);
 			$plgModel = JModelLegacy::getInstance($pluginName, 'TjreportsModel');
 
+			$defaultColToHide = $plgModel->getState('defaultColToHide');
+
 			$params = array();
 			$params['filter_order']     = $plgModel->getState('list.ordering');
 			$params['filter_order_Dir'] = $plgModel->getState('list.direction');
 			$params['limit']            = $plgModel->getState('list.limit');
 			$params['emailColumn']      = $plgModel->getState('emailColumn');
 			$params['colToshow']        = $plgModel->getState('colToshow');
 			$params['colToshow']        = array_combine($params['colToshow'], array_fill(0, count($params['colToshow']), true));
+
+			/* Here merge colToshow (array value is true) with defaultColToHide (array value is false) column -
+			 * so false value column not display on report by default.*/
+			if (!empty($defaultColToHide))
+			{
+				$params['colToshow']        = array_merge($params['colToshow'], $defaultColToHide);
+			}
+
 			$params['showHideColumns']  = $plgModel->showhideCols;
+			$params['piiColumns']       = $plgModel->getState('piiColumns');
 
 			$report->param = json_encode($params);
 		}

tjreports/administrator/sql/install.mysql.utf8.sql

@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `#__tj_reports` (
   `datadenyset` int(11),
   `param` text NOT NULL,
   PRIMARY KEY (`id`)
-) AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;

tjreports/administrator/sql/uninstall.mysql.utf8.sql

@@ -1,2 +1 @@
-
-DELETE FROM `#__content_types` WHERE (type_alias LIKE 'com_tjreports.%');
+-- DELETE FROM `#__content_types` WHERE (type_alias LIKE 'com_tjreports.%');

tjreports/administrator/sql/updates/mysql/1.1.2.sql

@@ -0,0 +1,9 @@
+-- Change engine
+ALTER TABLE `#__tj_reports` ENGINE = InnoDB;
+
+-- Change charset, collation for table #__tj_reports
+ALTER TABLE `#__tj_reports` CHANGE `title` `title` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+ALTER TABLE `#__tj_reports` CHANGE `alias` `alias` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+ALTER TABLE `#__tj_reports` CHANGE `plugin` `plugin` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8mb4_unicode_ci NOT NULL,
+ALTER TABLE `#__tj_reports` CHANGE `client` `client` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+ALTER TABLE `#__tj_reports` CHANGE `param` `param` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;

tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini

@@ -111,6 +111,8 @@ COM_TJREPORTS_ACCESS_VIEW_SUBSCRIBE_DESC="Allow user to view only subscribed rep
 JACTION_VIEW="View"
 JACTION_VIEW_COMPONENT_DESC="Allow user to view reports in this extension"
 JACTION_EXPORT="Export"
+COM_TJREPORTS_ACCESS_PIIDATA="View PII Data"
+COM_TJREPORTS_ACCESS_PIIDATA_COMPONENT_DESC="Allow user to see Personally Identifiable Information (PII) data on the report."
 JACTION_EXPORT_COMPONENT_DESC="Allow user to export report data in this extension"
 
 ;tjreport lms

tjreports/plugins/actionlog/tjreports/tjreports.xml

@@ -2,12 +2,12 @@
 <extension version="3.9" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_tjreports</name>
 	<author>Techjoomla</author>
-	<creationDate>12th Jul 2019</creationDate>
+	<creationDate>22nd Oct 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<description>PLG_ACTIONLOG_TJREPORTS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="tjreports">tjreports.php</filename>

tjreports/plugins/content/tjreportsfields/tjreportsfields.xml

@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>12th Jul 2019</creationDate>
+	<creationDate>22nd Oct 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 
 	<files>
 		<filename plugin="tjreportsfields">tjreportsfields.php</filename>

tjreports/plugins/privacy/tjreports/tjreports.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_tjreports</name>
-	<version>1.1.1</version>
-	<creationDate>12th Jul 2019</creationDate>
+	<version>1.1.2</version>
+	<creationDate>22nd Oct 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>

tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql

@@ -1,3 +1,5 @@
 CREATE TABLE IF NOT EXISTS `#__tjreports_com_users_user` (
-  `record_id` int(11) NOT NULL
+  `record_id` int(11) NOT NULL,
+  `username_hash` VARCHAR(100) NOT NULL,
+  `email_hash` VARCHAR(100) NOT NULL
 )ENGINE=InnoDB DEFAULT CHARSET=utf8;

tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.2.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `#__tjreports_com_users_user` ADD username_hash VARCHAR(100) NOT NULL AFTER record_id;
+ALTER TABLE `#__tjreports_com_users_user` ADD email_hash VARCHAR(100) NOT NULL AFTER username_hash;

tjreports/plugins/user/tjreportsindexer/tjreportsindexer.php

@@ -48,17 +48,6 @@ class PlgUserTjreportsindexer extends JPlugin
 	 */
 	public function onUserAfterSave($user, $isNew, $success, $msg)
 	{
-		/*
-		  [com_fields] => Array
-		(
-			[job-position] => Developer
-		)*/
-
-		if (empty($user['com_fields']))
-		{
-			return;
-		}
-
 		// Delete existing user-data entry
 		// Here record_id = user_id
 		$this->deleteIndexerEntry($user['id']);
@@ -153,6 +142,10 @@ protected function addIndexerEntry($user)
 			$values[]  = $db->quote($value);
 		}
 
+		// Add username & email hash values
+		array_push($columns, 'username_hash', 'email_hash');
+		array_push($values, "'" . md5($user['username']) . "'", "'" . md5($user['email']) . "'");
+
 		// Prepare the insert query
 		$query = $db->getQuery(true);
 		$query

tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml

@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>12th Jul 2019</creationDate>
+	<creationDate>22nd Oct 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<install>
         <sql>
             <file driver="mysql" charset="utf8">sql/tjreportsindexer.install.sql</file>

tjreports/site/assets/js/tjrContentUI.js

@@ -49,11 +49,11 @@ jQuery.extend(tjrContentUI.report, {
 
 				// If sendEmail plug is enabled then try to add a column of checkboxes
 				if (
-				  typeof tjutilitysendemail != 'undefined' &&
+				  typeof window.tjSendEmail.UI != 'undefined' &&
 				  jQuery('body').find('.td-sendemail').length > 0
 				)
 				{
-					tjutilitysendemail.addColumn('report-table');
+					window.tjemail = new window.tjSendEmail.UI("report-table", "td-sendemail", "cid");
 				}
 
 				// Reinitialze some js like for calandar, tooltip, chosen