Task #173069 feat: Update infra extensions code used to make Joomla 4 compatible

tjreports/administrator/controllers/reports.php

@@ -12,7 +12,6 @@
 
 // No direct access
 defined('_JEXEC') or die;
-jimport('joomla.application.component.controlleradmin');
 
 // Load frontend venues model
 JLoader::import('com_tjreports.controllers.reports', JPATH_SITE . '/components');

tjreports/administrator/controllers/tjreport.json.php

@@ -8,11 +8,11 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Response\JsonResponse;
 
-jimport('joomla.application.component.controllerform');
 /**
  * tjreport Controller
  *

tjreports/administrator/controllers/tjreport.php

@@ -8,10 +8,10 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Factory;
 
-jimport('joomla.application.component.controllerform');
 /**
  * tjreport Controller
  *

tjreports/administrator/controllers/tjreports.php

@@ -8,11 +8,13 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Language\Text;
+
 /**
  * com tjreports Controller
  *

tjreports/administrator/helpers/tjreports.php

@@ -9,6 +9,7 @@
  */
 // No direct access
 defined('_JEXEC') or die;
+
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
@@ -109,15 +110,15 @@ public function getViewpath($component, $viewname, $layout = 'default', $searchT
 
 		$layoutname = $layout . '.php';
 
-		$override = $searchTmpPath . '/' . 'templates' . '/' . $app->getTemplate() . '/' . 'html' . '/' . $component . '/' . $viewname . '/' . $layoutname;
+		$override = $searchTmpPath . '/templates/' . $app->getTemplate() . '/html/' . $component . '/' . $viewname . '/' . $layoutname;
 
 		if (File::exists($override))
 		{
 			return $view = $override;
 		}
 		else
 		{
-			return $view = $useViewpath . '/' . 'components' . '/' . $component . '/' . 'views' . '/' . $viewname . '/' . 'tmpl' . '/' . $layoutname;
+			return $view = $useViewpath . '/components/' . $component . '/views/' . $viewname . '/tmpl/' . $layoutname;
 		}
 	}
 }

tjreports/administrator/models/fields/createdby.php

@@ -8,11 +8,10 @@
  */
 
 defined('JPATH_BASE') or die;
+
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Factory;
 
-jimport('joomla.form.formfield');
-
 /**
  * Supports an HTML select list of categories
  *

tjreports/administrator/models/fields/custom_field.php

@@ -8,10 +8,8 @@
  */
 
 defined('JPATH_BASE') or die;
-use Joomla\CMS\Form\FormField;
 
-jimport('joomla.html.html');
-jimport('joomla.form.formfield');
+use Joomla\CMS\Form\FormField;
 
 /**
  * Supports an HTML select list of categories

tjreports/administrator/models/fields/filemultiple.php

@@ -8,9 +8,8 @@
  */
 
 defined('JPATH_BASE') or die;
-use Joomla\CMS\Form\FormField;
 
-jimport('joomla.form.formfield');
+use Joomla\CMS\Form\FormField;
 
 /**
  * Supports an HTML select list of categories

tjreports/administrator/models/fields/foreignkey.php

@@ -8,12 +8,11 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('JPATH_BASE') or die;
+
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 
-jimport('joomla.form.formfield');
-
 /**
  * Supports a value from an external table
  *

tjreports/administrator/models/fields/modifiedby.php

@@ -8,11 +8,10 @@
  */
 
 defined('JPATH_BASE') or die;
+
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Factory;
 
-jimport('joomla.form.formfield');
-
 /**
  * Supports an HTML select list of categories
  *

tjreports/administrator/models/fields/timecreated.php

@@ -8,13 +8,12 @@
  */
 
 defined('JPATH_BASE') or die;
+
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Language\Text;
 
-jimport('joomla.form.formfield');
-
 /**
  * Supports an HTML select list of categories
  *

tjreports/administrator/models/fields/timeupdated.php

@@ -8,13 +8,12 @@
  */
 
 defined('JPATH_BASE') or die;
+
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
 
-jimport('joomla.form.formfield');
-
 /**
  * Supports an HTML select list of categories
  *

tjreports/administrator/models/fields/users.php

@@ -9,6 +9,7 @@
 
 // No direct access.
 defined('_JEXEC') or die();
+
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Form\Field\UserField;
 use Joomla\CMS\Factory;

tjreports/administrator/models/indexer.php

@@ -10,8 +10,8 @@
 
 // No direct access.
 defined('_JEXEC') or die('Restricted access');
-use Joomla\CMS\Response\JsonResponse;
 
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 

tjreports/administrator/models/tjreport.php

@@ -8,10 +8,12 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
 /**
  * jticketing Model
  *
@@ -227,7 +229,6 @@ public function getReportPluginData($pluginId, $pluginName = null)
 	 */
 	protected function prepareTable($table)
 	{
-		jimport('joomla.filter.output');
 		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
 

tjreports/administrator/models/tjreports.php

@@ -8,8 +8,10 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Factory;
+
 /**
  * Tjreportslist Model
  *

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

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

tjreports/administrator/sql/updates/mysql/1.1.8.sql

@@ -10,4 +10,4 @@ ALTER TABLE `#__tj_reports` CHANGE `parent` `parent` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `#__tj_reports` CHANGE `default` `default` tinyint(4) NOT NULL DEFAULT 0;
 ALTER TABLE `#__tj_reports` CHANGE `userid` `userid` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `#__tj_reports` CHANGE `datadenyset` `datadenyset` int(11) DEFAULT 0;
-ALTER TABLE `#__tj_reports` CHANGE `param` `param` text NOT NULL DEFAULT '';
+ALTER TABLE `#__tj_reports` CHANGE `param` `param` text NOT NULL;

tjreports/administrator/sql/updates/mysql/2.0.0.sql

@@ -0,0 +1,13 @@
+-- Adding default values to the column of existing table
+
+ALTER TABLE `#__tj_reports`	CHANGE `asset_id` `asset_id` int(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `ordering` `ordering` int(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `title` `title` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__tj_reports` CHANGE `alias` `alias` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__tj_reports` CHANGE `plugin` `plugin` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__tj_reports` CHANGE `client` `client` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__tj_reports` CHANGE `parent` `parent` int(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `default` `default` tinyint(4) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `userid` `userid` int(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `datadenyset` `datadenyset` int(11) DEFAULT 0;
+ALTER TABLE `#__tj_reports` CHANGE `param` `param` text DEFAULT NULL;

tjreports/administrator/tables/tjreport.php

@@ -8,12 +8,14 @@
  */
 // No direct access
 defined('_JEXEC') or die;
+
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Language\Text;
+
 /**
- * Hello Table class
+ * Report Table class
  *
  * @since  0.0.1
  */

tjreports/administrator/tjreports.php

@@ -9,6 +9,7 @@
 
 // No direct access
 defined('_JEXEC') or die;
+
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
@@ -41,7 +42,6 @@
 $document->addStyleSheet(Uri::root(true) . '/media/com_tjreports/css/font-awesome/css/font-awesome.min.css');
 
 // Include dependancies
-jimport('joomla.application.component.controller');
 
 JLoader::registerPrefix('Tjreports', JPATH_COMPONENT_ADMINISTRATOR);
 

tjreports/administrator/views/reports/tmpl/default.php

@@ -10,14 +10,13 @@
 // no direct access
 defined('_JEXEC') or die;
 
-// No direct access
-defined('_JEXEC') or die;
-
 // Load the layout & push variables
+$bs = (JVERSION < '4.0.0') ? 'bs3' : 'bs5';
+
+$path = $this->tjreportsHelper->getViewpath('com_tjreports', 'reports', 'default_' . $bs, 'SITE', 'SITE');
 
-$path = $this->tjreportsHelper->getViewpath('com_tjreports', 'reports', 'default', 'SITE', 'SITE');
 ob_start();
-include($path);
+include $path;
 $html = ob_get_contents();
 ob_end_clean();
 echo $html;

tjreports/administrator/views/reports/tmpl/default_filters.php

@@ -10,11 +10,7 @@
 // no direct access
 defined('_JEXEC') or die;
 
-// No direct access
-defined('_JEXEC') or die;
-
 // Load the layout & push variables
-
 $path = $this->tjreportsHelper->getViewpath('com_tjreports', 'reports', 'default_filters', 'SITE', 'SITE');
 ob_start();
 include($path);

tjreports/administrator/views/reports/tmpl/default_summary.php

@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 // Load the layout & push variables
-
 $path = $this->tjreportsHelper->getViewpath('com_tjreports', 'reports', 'default_summary', 'SITE', 'SITE');
 ob_start();
 include $path;

tjreports/administrator/views/reports/view.base.php

@@ -12,4 +12,6 @@
 
 // No direct access
 defined('_JEXEC') or die;
+
+require_once JPATH_SITE . '/components/com_tjreports/views/reports/view.base.php';
 JLoader::register('ReportsViewBase', JPATH_SITE . '/components/com_tjreports/views/reports/view.base.php');

tjreports/administrator/views/reports/view.csv.php

@@ -13,4 +13,6 @@
 
 // No direct access
 defined('_JEXEC') or die;
+
+require_once JPATH_SITE . '/components/com_tjreports/views/reports/view.csv.php';
 JLoader::register('TjreportsViewReports', JPATH_SITE . '/components/com_tjreports/views/reports/view.csv.php');

tjreports/administrator/views/reports/view.json.php

@@ -12,4 +12,6 @@
 
 // No direct access
 defined('_JEXEC') or die;
+
+require_once JPATH_SITE . '/components/com_tjreports/views/reports/view.json.php';
 JLoader::register('TjreportsViewReports', JPATH_SITE . '/components/com_tjreports/views/reports/view.json.php');

tjreports/administrator/views/tjreport/tmpl/edit.php

@@ -8,27 +8,30 @@
  */
 // No direct access
 defined('_JEXEC') or die;
+
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+
 HTMLHelper::_('behavior.formvalidator');
 $input = Factory::getApplication()->input;
 
 $showParent = true;
-if($this->form->getValue('id'))
+
+if ($this->form->getValue('id'))
 {
-	if(!$this->form->getValue('parent'))
+	if (!$this->form->getValue('parent'))
 	{
 		$showParent = false;
 	}
 
-	$this->form->setFieldAttribute('client','readonly','readonly');
-	$this->form->setFieldAttribute('parent','readonly','readonly');
+	$this->form->setFieldAttribute('client', 'readonly', 'readonly');
+	$this->form->setFieldAttribute('parent', 'readonly', 'readonly');
 }
 else
 {
-	$this->form->setFieldAttribute('parent','required','required');
+	$this->form->setFieldAttribute('parent', 'required', 'required');
 }
 
 JFactory::getDocument()->addScriptDeclaration('

tjreports/administrator/views/tjreports/tmpl/default.php

@@ -8,11 +8,13 @@
  */
 // No direct access to this file
 defined('_JEXEC') or die;
+
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+
 HTMLHelper::_('formbehavior.chosen', 'select');
 $user	= Factory::getUser();
 $listOrder     = $this->escape($this->state->get('list.ordering'));