Merge pull request #223 from techjoomla/release-1.1.7

Merge `release-1.1.7` into `master`
techjoomla · Aug 17, 2021 · 5dfb56a · 5dfb56a
2 parents ff61edd + 955e593
commit 5dfb56a
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 14 deletions.
diff --git a/tjreports/administrator/views/tjreport/view.html.php b/tjreports/administrator/views/tjreport/view.html.php
@@ -111,8 +111,8 @@ protected function addDocumentHeaderData()
 
 		$document = Factory::getDocument();
 
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentService.min.js');
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentUI.min.js');
+		HTMLHelper::_('script', 'com_tjreports/tjrContentService.min.js', array("relative" => true));
+		HTMLHelper::_('script', 'com_tjreports/tjrContentUI.min.js', array("relative" => true));
 		HTMLHelper::_('stylesheet', 'components/com_tjreports/assets/css/tjreports.min.css');
 
 		$document->addScriptDeclaration('tjrContentUI.base_url = "' . Uri::base() . '"');

diff --git a/...ports/site/assets/js/tjrContentService.js → tjreports/media/js/tjrContentService.js b/...ports/site/assets/js/tjrContentService.js → tjreports/media/js/tjrContentService.js
diff --git a/...s/site/assets/js/tjrContentService.min.js → tjreports/media/js/tjrContentService.min.js b/...s/site/assets/js/tjrContentService.min.js → tjreports/media/js/tjrContentService.min.js
diff --git a/tjreports/site/assets/js/tjrContentUI.js → tjreports/media/js/tjrContentUI.js b/tjreports/site/assets/js/tjrContentUI.js → tjreports/media/js/tjrContentUI.js
diff --git a/tjreports/site/assets/js/tjrContentUI.min.js → tjreports/media/js/tjrContentUI.min.js b/tjreports/site/assets/js/tjrContentUI.min.js → tjreports/media/js/tjrContentUI.min.js
diff --git a/tjreports/plugins/actionlog/tjreports/tjreports.xml b/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 2021</creationDate>
+	<creationDate>17th Aug 2021</creationDate>
 	<copyright>Copyright (C) 2016 - 2021 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.6</version>
+	<version>1.1.7</version>
 	<description>PLG_ACTIONLOG_TJREPORTS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="tjreports">tjreports.php</filename>

diff --git a/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml b/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 2021</creationDate>
+	<creationDate>17th Aug 2021</creationDate>
 	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 
 	<files>
 		<filename plugin="tjreportsfields">tjreportsfields.php</filename>

diff --git a/tjreports/plugins/privacy/tjreports/tjreports.xml b/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.6</version>
-	<creationDate>12th Jul 2021</creationDate>
+	<version>1.1.7</version>
+	<creationDate>17th Aug 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>

diff --git a/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml b/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 2021</creationDate>
+	<creationDate>17th Aug 2021</creationDate>
 	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 	<install>
         <sql>
             <file driver="mysql" charset="utf8">sql/tjreportsindexer.install.sql</file>

diff --git a/tjreports/script.tjreports.php b/tjreports/script.tjreports.php
@@ -43,6 +43,17 @@
  **/
 class Com_TjreportsInstallerScript
 {
+	private $removeFilesAndFolders = array(
+		'files' => array(
+			// Since v1.1.7
+			'components/com_tjreports/assets/js/tjrContentService.js',
+			'components/com_tjreports/assets/js/tjrContentService.min.js',
+			'components/com_tjreports/assets/js/tjrContentUI.js',
+			'components/com_tjreports/assets/js/tjrContentUI.min.js',
+		),
+		'folders' => array()
+	);
+
 /** @var array The list of extra modules and plugins to install */
 	private $queue = array(
 
@@ -238,6 +249,9 @@ public function postflight($type, $parent)
 			}
 		}
 
+		// Remove obsolete files and folders
+		$this->removeObsoleteFilesAndFolders($this->removeFilesAndFolders);
+
 		$this->migrateReportsOrdering();
 	}
 
@@ -266,4 +280,36 @@ public function migrateReportsOrdering()
 			$reportTable->save($data);
 		}
 	}
+
+	/**
+	 * Removes obsolete files and folders
+	 *
+	 * @param array $removeFilesAndFolders
+	 */
+	private function removeObsoleteFilesAndFolders($removeFilesAndFolders)
+	{
+		// Remove files
+		jimport('joomla.filesystem.file');
+		if(!empty($removeFilesAndFolders['files']))
+		{
+			foreach($removeFilesAndFolders['files'] as $file)
+			{
+				$f = JPATH_ROOT.'/'.$file;
+				if(!JFile::exists($f)) continue;
+				JFile::delete($f);
+			}
+		}
+
+		// Remove folders
+		jimport('joomla.filesystem.file');
+		if(!empty($removeFilesAndFolders['folders']))
+		{
+			foreach($removeFilesAndFolders['folders'] as $folder)
+			{
+				$f = JPATH_ROOT.'/'.$folder;
+				if(!file_exists($f)) continue;
+				JFolder::delete($f);
+			}
+		}
+	}
 }
diff --git a/tjreports/site/views/reports/view.html.php b/tjreports/site/views/reports/view.html.php
@@ -159,8 +159,8 @@ protected function addDocumentHeaderData()
 			HTMLHelper::stylesheet(Uri::root() . '/media/techjoomla_strapper/bs3/css/bootstrap.min.css');
 		}
 
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentService.min.js', array("relative" => true));
-		HTMLHelper::_('script', 'components/com_tjreports/assets/js/tjrContentUI.min.js', array("relative" => true));
+		HTMLHelper::_('script', 'com_tjreports/tjrContentService.min.js', array("relative" => true));
+		HTMLHelper::_('script', 'com_tjreports/tjrContentUI.min.js', array("relative" => true));
 		HTMLHelper::_('stylesheet', 'components/com_tjreports/assets/css/tjreports.min.css');
 
 		$document->addScriptDeclaration('tjrContentUI.base_url = "' . Uri::base() . '"');

diff --git a/tjreports/tjreports.xml b/tjreports/tjreports.xml
@@ -6,8 +6,8 @@
 	<authorUrl>https://techjoomla.com</authorUrl>
 	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<creationDate>12th Jul 2021</creationDate>
-	<version>1.1.6</version>
+	<creationDate>17th Aug 2021</creationDate>
+	<version>1.1.7</version>
 	<description>This component is used to access all the report at single place.</description>
 	<install>
 		<!-- Runs on install -->