diff --git a/CHANGELOG.md b/CHANGELOG.md
index 311d6c41d..a4a652a42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v4.0.2-alpha1
+
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+
# v4.0.1
- Fix auto build from SQL in Joomla 4.
diff --git a/ComponentbuilderInstallerScript.php b/ComponentbuilderInstallerScript.php
index 26445fb2b..257874e31 100644
--- a/ComponentbuilderInstallerScript.php
+++ b/ComponentbuilderInstallerScript.php
@@ -3267,7 +3267,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
echo '
-
Upgrade to Version 4.0.1 Was Successful! Let us know if anything is not working as expected.
';
+
Upgrade to Version 4.0.2-alpha1 Was Successful! Let us know if anything is not working as expected.
';
// Add/Update component in the action logs extensions table.
$this->setActionLogsExtensions();
diff --git a/README.md b/README.md
index 130d774fd..ed0fc2c3c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.1) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.2-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -144,13 +144,13 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 20th July, 2024
-+ *Version*: 4.0.1
++ *Last Build*: 26th July, 2024
++ *Version*: 4.0.2-alpha1
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **780706**
++ *Line count*: **790585**
+ *Field count*: **2104**
-+ *File count*: **5462**
++ *File count*: **5483**
+ *Folder count*: **540**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index 130d774fd..ed0fc2c3c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.1) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (4.0.2-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -144,13 +144,13 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 20th July, 2024
-+ *Version*: 4.0.1
++ *Last Build*: 26th July, 2024
++ *Version*: 4.0.2-alpha1
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **780706**
++ *Line count*: **790585**
+ *Field count*: **2104**
-+ *File count*: **5462**
++ *File count*: **5483**
+ *Folder count*: **540**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
index 2ae71fed7..c117fa8ae 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
@@ -27,6 +27,62 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+ * @since 3.10.11
+ */
+ public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
/**
* ###Views### view display method
*
@@ -43,7 +99,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();###ADMIN_DIPLAY_METHOD###
+ $this->user ??= $this->getCurrentUser();###ADMIN_DIPLAY_METHOD###
$this->saveOrder = $this->listOrder == 'a.ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
index 5e4b702cf..51966d554 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* ###View### view display method
*
@@ -41,7 +121,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_###component###');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
index c8d70e3ac..96faeed38 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The user object.
+ *
+ * @var Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+ * @since 3.10.11
+ */
+ public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
/**
* Display the view
*
@@ -42,11 +74,11 @@ class HtmlView extends BaseHtmlView
// get the application
$this->app ??= Factory::getApplication();
// get the user object
- $this->user ??= $this->app->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// get global action permissions
$this->canDo = ###Component###Helper::getActions('###sview###');
- $this->styles = $this->get('Styles');
- $this->scripts = $this->get('Scripts');###CUSTOM_ADMIN_DIPLAY_METHOD###
+ $this->styles = $this->get('Styles') ?? [];
+ $this->scripts = $this->get('Scripts') ?? [];###CUSTOM_ADMIN_DIPLAY_METHOD###
// Set the html view document stuff
$this->_prepareDocument();
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
index 0f3cac219..87d613574 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral view item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* ###View### view display method
*
@@ -41,11 +121,11 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_###component###');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->state = $this->get('State');
- $this->styles = $this->get('Styles');
- $this->scripts = $this->get('Scripts');
+ $this->styles = $this->get('Styles') ?? [];
+ $this->scripts = $this->get('Scripts') ?? [];
// get action permissions
$this->canDo = ###Component###Helper::getActions('###view###', $this->item);
// get input
@@ -97,6 +177,9 @@ class HtmlView extends BaseHtmlView
protected function addToolbar(): void
{
###ADDTOOLBAR###
+
+ // now initiate the toolbar
+ $this->toolbar ??= Toolbar::getInstance();
}
/**
diff --git a/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php b/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
index 704227616..110caef0b 100644
--- a/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php
@@ -15,9 +15,13 @@ defined('_JCB_TEMPLATE') or die;
###BOM###
namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controller;
+use Joomla\Input\Input;
use Joomla\CMS\Factory;
+use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\Router\Route;
+use Joomla\CMS\User\User;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Language\Text;
@@ -31,13 +35,50 @@ use Joomla\CMS\Language\Text;
*/
class DisplayController extends BaseController
{
+ /**
+ * The allowed edit views.
+ *
+ * @var array
+ * @since 4.0.0
+ */
+ protected array $allowed_edit_views = [###SITE_ALLOW_EDIT_VIEWS_ARRAY###
+ ];
+
+ /**
+ * The application identity object.
+ *
+ * @var User
+ * @since 4.0.0
+ */
+ protected $identity;
+
+ /**
+ * @param array $config An optional associative array of configuration settings.
+ * Recognized key values include 'name', 'default_task', 'model_path', and
+ * 'view_path' (this list is not meant to be comprehensive).
+ * @param MVCFactoryInterface|null $factory The factory.
+ * @param CMSApplication|null $app The Application for the dispatcher
+ * @param Input|null $input The Input object for the request
+ *
+ * @throws \Exception
+ * @since 3.0.1
+ */
+ public function __construct($config = [], MVCFactoryInterface $factory = null, $app = null, $input = null)
+ {
+ $app ??= Factory::getApplication();
+ $this->identity ??= $app->getIdentity();
+
+ parent::__construct($config, $factory, $app, $input);
+ }
+
/**
* Method to display a view.
*
- * @param boolean $cachable If true, the view output will be cached.
- * @param boolean $urlparams An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+ * @param boolean $cachable If true, the view output will be cached.
+ * @param boolean|array $urlparams An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
*
* @return DisplayController This object to support chaining.
+ * @throws \Exception
* @since 1.5
*/
function display($cachable = false, $urlparams = false)
@@ -51,14 +92,13 @@ class DisplayController extends BaseController
$cachable = true;
// ensure that the view is not cashable if edit view or if user is logged in
- $user = $this->app->getIdentity();
- if ($user->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
+ if ($this->identity->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
{
$cachable = false;
}
// Check for edit form.
- if ($isEdit && !$this->checkEditId('com_###component###.edit.'.$view, $id))
+ if ($isEdit && !$this->checkEditId($view, $id))
{
// check if item was opened from other than its own list view
$ref = $this->input->getCmd('ref', 0);
@@ -68,12 +108,12 @@ class DisplayController extends BaseController
if ($refid > 0 && Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
{
// redirect to item of ref
- $this->setRedirect(Route::_('index.php?option=com_###component###&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
+ $this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref . '&layout=edit&id=' . (int) $refid, false));
}
elseif (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
{
// redirect to ref
- $this->setRedirect(Route::_('index.php?option=com_###component###&view='.(string)$ref, false));
+ $this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref, false));
}
else
{
@@ -115,18 +155,133 @@ class DisplayController extends BaseController
return $this;
}
- protected function checkEditView($view)
+ /**
+ * Method to check whether an ID is in the edit list.
+ *
+ * @param string $context The view name.
+ * @param integer $id The ID of the record to add to the edit list.
+ *
+ * @return boolean True if the ID is in the edit list.
+ *
+ * @throws \Exception
+ * @since 3.0
+ */
+ protected function checkEditId($context, $id)
+ {
+ if (parent::checkEditId("com_###component###.edit.{$context}", $id))
+ {
+ return true;
+ }
+
+ // check user edit access
+ if ($this->canEditId($context, $id))
+ {
+ $this->holdEditId("com_###component###.edit.{$context}", $id);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Method to check whether an ID is allowed to be edited by the active user.
+ *
+ * @param string $view The view name.
+ * @param integer $id The ID of the record to add to the edit list.
+ *
+ * @return boolean True if the ID is in the edit list.
+ *
+ * @since 5.0.2
+ */
+ protected function canEditId($view, $id): bool
+ {
+ // check that this view is even allowed
+ $allowed = $this->getAllowedEditView($view);
+ if ($allowed === null)
+ {
+ return false;
+ }
+
+ // check if this item has custom function set for canEditId
+ if (isset($allowed['function'])
+ && method_exists($this, $allowed['function'])
+ && $this->{$allowed['function']}(['id' => $id], 'id'))
+ {
+ return true;
+ }
+
+ // check if this item can be accessed (and has access)
+ $access = true;
+ if (isset($allowed['access']))
+ {
+ $access = ($this->identity->authorise($allowed['access'], "com_###component###.{$view}." . (int) $id)
+ && $this->identity->authorise($allowed['access'], 'com_###component###'));
+ }
+
+ // check if this item can be edited
+ $edit = false;
+ if ($access && isset($allowed['edit']))
+ {
+ $edit = ($this->identity->authorise($allowed['edit'], "com_###component###.{$view}." . (int) $id)
+ && $this->identity->authorise($allowed['edit'], 'com_###component###'));
+ }
+
+ // check if this item can be edited by owner
+ if ($access && !$edit && isset($allowed['edit.own']))
+ {
+ $edit = ($this->identity->authorise($allowed['edit.own'], "com_###component###.{$view}." . (int) $id)
+ && $this->identity->authorise($allowed['edit.own'], 'com_###component###'));
+ }
+
+ return $edit;
+ }
+
+ /**
+ * Checks if the provided view is an edit view.
+ *
+ * This method verifies whether the given view name is recognized as an edit view.
+ * It uses the StringHelper::check() method to validate the input and then checks
+ * against a predefined list of edit views.
+ *
+ * @param string|null $view The name of the view to check.
+ *
+ * @return bool True if the view is an edit view, false otherwise.
+ * @since 4.0.0
+ */
+ protected function checkEditView(?string $view): bool
{
if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
{
- $views = [###SITE_EDIT_VIEW_ARRAY###
- ];
- // check if this is a edit view
- if (in_array($view,$views))
+ // check if this is an edit view
+ if (isset($this->allowed_edit_views[$view]))
{
return true;
}
}
+
return false;
}
+
+ /**
+ * Get the allowed edit view permission map
+ *
+ * @param string|null $view The name of the view to check.
+ *
+ * @return array|null The permissions map
+ * @since 5.0.2
+ */
+ protected function getAllowedEditView(?string $view): ?array
+ {
+ if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
+ {
+ // check if this is an edit view
+ if (isset($this->allowed_edit_views[$view]))
+ {
+ return $this->allowed_edit_views[$view];
+ }
+ }
+
+ return null;
+ }###SITE_ALLOW_EDIT_VIEWS_FUNCTIONS###
}
diff --git a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
index 7cf77c74c..a01ccbb92 100644
--- a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
@@ -27,6 +27,54 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The user object.
+ *
+ * @var Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+ * @since 3.10.11
+ */
+ public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
/**
* Display the view
*
@@ -82,6 +130,7 @@ class HtmlView extends BaseHtmlView
{
ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
}
+
// now initiate the toolbar
$this->toolbar = Toolbar::getInstance();
}###SITE_GET_MODULE###
diff --git a/admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php b/admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php
index 6c8ff320f..37de516f6 100644
--- a/admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php
+++ b/admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php
@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controll
*
* @since 1.6
*/
-class ###SView###Controller extends FormController
+class ###SView###Controller extends Joomla___907ccae5_57a9_44b9_a8aa_5b905d1cd70f___Power
{
/**
* The prefix to use with controller messages.
@@ -107,14 +107,14 @@ class ###SView###Controller extends FormController
* Function that allows child controller access to model data
* after the data has been saved.
*
- * @param BaseDatabaseModel $model The data model object.
+ * @param Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power $model The data model object.
* @param array $validData The validated data.
*
* @return void
*
* @since 12.2
*/
- protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
+ protected function postSaveHook(Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power $model, $validData = [])
{
}
}
diff --git a/admin/compiler/joomla_4/SITE_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
index 56b208d85..375cf05a0 100644
--- a/admin/compiler/joomla_4/SITE_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 3.10.11
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 3.10.11
+ */
+ protected array $scripts;
+
+ /**
+ * The user object.
+ *
+ * @var Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+ * @since 3.10.11
+ */
+ public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
/**
* Display the view
*
@@ -41,10 +73,10 @@ class HtmlView extends BaseHtmlView
$this->app ??= Factory::getApplication();
$this->params = $this->app->getParams();
$this->menu = $this->app->getMenu()->getActive();
- $this->styles = $this->get('Styles');
- $this->scripts = $this->get('Scripts');
+ $this->styles = $this->get('Styles') ?? [];
+ $this->scripts = $this->get('Scripts') ?? [];
// get the user object
- $this->user ??= $this->app->getIdentity();###SITE_DIPLAY_METHOD###
+ $this->user ??= $this->getCurrentUser();###SITE_DIPLAY_METHOD###
}###SITE_EXTRA_DIPLAY_METHODS###
/**
@@ -82,8 +114,9 @@ class HtmlView extends BaseHtmlView
{
ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
}
+
// now initiate the toolbar
- $this->toolbar = Toolbar::getInstance();
+ $this->toolbar ??= Toolbar::getInstance();
}###SITE_GET_MODULE###
/**
diff --git a/admin/forms/component_updates.xml b/admin/forms/component_updates.xml
index 037909a66..4260026fe 100644
--- a/admin/forms/component_updates.xml
+++ b/admin/forms/component_updates.xml
@@ -250,7 +250,7 @@
label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_LABEL"
size="10"
maxlength="50"
- default="3.*"
+ default="5\.[012]"
description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_DESCRIPTION"
class="text_area"
filter="string"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 90d0e2410..b3330eaa1 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3320,7 +3320,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_DESCRIPTION="Set the release
COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_HINT="stable"
COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_STATE_LABEL="Release State"
COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_DESCRIPTION="Set the release target version"
-COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_HINT="3.*"
+COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_HINT="5\.[012]"
COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_LABEL="Update Server Release Target Version"
COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION="Enter Download Link"
COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_HINT="http://www.example.com/file.zip"
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 904ee232a..a27e9063e 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -2089,7 +2089,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls
--
INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_admin_event`, `add_backup_folder_path`, `add_css_admin`, `add_css_site`, `add_email_helper`, `add_git_folder_path`, `add_javascript`, `add_menu_prefix`, `add_namespace_prefix`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_method_uninstall`, `add_php_postflight_install`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_powers`, `add_sales_server`, `add_site_event`, `add_sql`, `add_sql_uninstall`, `add_update_server`, `addcontributors`, `addfootable`, `addreadme`, `adduikit`, `assets_table_fix`, `author`, `backup_folder_path`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `copyright`, `created`, `creatuserhelper`, `crowdin_account_api_key`, `crowdin_project_api_key`, `crowdin_project_identifier`, `crowdin_username`, `css_admin`, `css_site`, `dashboard`, `dashboard_type`, `debug_linenr`, `description`, `email`, `emptycontributors`, `export_buy_link`, `export_key`, `git_folder_path`, `guid`, `image`, `javascript`, `joomla_source_link`, `license`, `menu_prefix`, `modified`, `mvc_versiondate`, `name`, `name_code`, `namespace_prefix`, `number`, `php_admin_event`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_method_uninstall`, `php_method_install`, `php_postflight_install`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `php_site_event`, `readme`, `remove_line_breaks`, `sales_server`, `short_description`, `sql`, `sql_uninstall`, `system_name`, `toignore`, `translation_tool`, `update_server`, `update_server_target`, `update_server_url`, `website`, `params`, `published`, `version`, `hits`, `access`, `ordering`) VALUES
-(25, '', '', '', '', '', '', '', 1, '', '', '', 1, '', 1, '', '', '', '', 1, '', '', '', '', 1, '{}', '', 1, 1, 3, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '2.1.0', 'Copyright (C) 2015. All Rights Reserved', '2016-10-18 11:44:09', '', 'mvVkzmHCEIoBhzD3gR3uTzXRGwNVNRWw8Hr1vrXxb+I=', 'BbloLSYT6Yup6v3I/YNmrdOwzjbI4BGfDvJSB82N9DU=', '', 'VtSt2RMz+AHCrwc7jk1G70t83ZwZsNp2upqfzMyaVHE=', '', '', '', 1, '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'joomla@vdm.io', '', '', 'nZDegSPK87rXA4KMC6P8I6zEldjVIJpPYGRPZlKBI+U=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', '»', '2024-01-19 11:57:08', '', 'Demo', 'demo', 'JCB', 4, '', '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', '', '', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBGYWN0b3J5OjpnZXRBcHBsaWNhdGlvbigpOw0KCQkkYXBwLT5lbnF1ZXVlTWVzc2FnZSgnVGhpcyBpcyBhIGRlbW8gY29tcG9uZW50IGRldmVsb3BlZCBpbiA8YSBocmVmPSJodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+ISBZb3UgY2FuIGJ1aWxkIG1vcmUgY29tcG9uZW50cyBsaWtlIHRoaXMgd2l0aCBKQ0IsIGNoZWNrb3V0IG91ciBwYWdlIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5naXRodWI8L2E+IGZvciBtb3JlIGluZm8uIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Sm9vbWxhIENvbXBvbmVudCBEZXZlbG9wbWVudDwvYT4gaXMgSGVyZSEnLCAnSW5mbycpOw==', '', '', '', '', 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', '', '', 'Demo Component', '', '', 'Demo (public)', '.git', '', '', 2, 'https://raw.githubusercontent.com/namibia/demo-joomla-3-component/master/demo_updateserver.xml', 'https://www.vdm.io/', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, 54, '', 1, 10);
+(25, '', '', '', '', '', '', '', 1, '', '', 1, '', '', 1, '', '', '', '', 1, '', '', '', '', 1, '{}', '', 1, 3, 3, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '5.0.0', 'Copyright (C) 2015. All Rights Reserved', '2016-10-18 11:44:09', '', 'JEl15Tox48qBC67gFA3BFmY1Ti/z8VfnxnSdEkgC330=', 'U78ZMsh7lfg/PmyRyrhMJ81r0PMKHYghhRW/GU6P/KI=', '', '4Pce5rC1MUF+opQEt9cE9In8yOrdYepDEJKpNQOx7SE=', '', '', '', 1, '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'joomla@vdm.io', '', '', 'QvjfxcSoqPTlwNZqSIbptkk/kZrnMWIzOEEQ2xFuLd0=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', '»', '2024-07-24 14:34:48', '', 'Demo', 'Demo', 'JCB', 4, '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ==', '', '', '', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBGYWN0b3J5OjpnZXRBcHBsaWNhdGlvbigpOw0KCQkkYXBwLT5lbnF1ZXVlTWVzc2FnZSgnVGhpcyBpcyBhIGRlbW8gY29tcG9uZW50IGRldmVsb3BlZCBpbiA8YSBocmVmPSJodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+ISBZb3UgY2FuIGJ1aWxkIG1vcmUgY29tcG9uZW50cyBsaWtlIHRoaXMgd2l0aCBKQ0IsIGNoZWNrb3V0IG91ciBwYWdlIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5naXRodWI8L2E+IGZvciBtb3JlIGluZm8uIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Sm9vbWxhIENvbXBvbmVudCBEZXZlbG9wbWVudDwvYT4gaXMgSGVyZSEnLCAnSW5mbycpOw==', '', '', '', '', 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', '', '', 'Demo Component', '', '', 'Demo (public)', '.git', '', '', 2, 'https://raw.githubusercontent.com/namibia/demo-joomla-3-component/master/demo_updateserver.xml', 'https://www.vdm.io/', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, 57, '', 1, 10);
--
-- Dumping data for table `#__componentbuilder_joomla_plugin`
@@ -2106,15 +2106,15 @@ INSERT INTO `#__componentbuilder_joomla_plugin` (`id`, `add_head`, `add_php_meth
--
INSERT INTO `#__componentbuilder_admin_view` (`id`, `add_css_view`, `add_css_views`, `add_custom_button`, `add_custom_import`, `add_fadein`, `add_javascript_view_file`, `add_javascript_view_footer`, `add_javascript_views_file`, `add_javascript_views_footer`, `add_php_ajax`, `add_php_allowedit`, `add_php_batchcopy`, `add_php_batchmove`, `add_php_getitem`, `add_php_getitems`, `add_php_getitems_after_all`, `add_php_getlistquery`, `add_php_postsavehook`, `add_php_save`, `add_sql`, `addlinked_views`, `addpermissions`, `addtables`, `addtabs`, `add_php_before_delete`, `add_php_before_publish`, `add_php_document`, `add_php_after_delete`, `add_php_after_publish`, `php_before_delete`, `php_before_publish`, `php_controller`, `php_document`, `php_after_delete`, `php_after_publish`, `ajax_input`, `css_view`, `css_views`, `custom_button`, `description`, `html_import_view`, `icon`, `icon_add`, `icon_category`, `javascript_view_file`, `javascript_view_footer`, `javascript_views_file`, `javascript_views_footer`, `name_list`, `system_name`, `name_single`, `php_ajaxmethod`, `php_allowedit`, `php_batchcopy`, `php_batchmove`, `php_getitem`, `php_getitems`, `php_getitems_after_all`, `php_getlistquery`, `php_import`, `php_import_display`, `php_import_save`, `php_import_setdata`, `php_model`, `php_postsavehook`, `php_save`, `short_description`, `source`, `sql`, `type`, `php_before_save`, `php_controller_list`, `php_getform`, `php_after_cancel`, `php_allowadd`, `php_before_cancel`, `php_import_ext`, `php_import_headers`, `php_model_list`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `guid`) VALUES
-(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '{}', '', '', '{}', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '', '', '', '', '', '', '', '', '', '{\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}}},\"privacy\":{\"activate\":\"1\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"682\"}}', 1, '2016-10-18 11:44:46', '2020-05-21 14:39:27', 18, '', 110, 'c1053952-8a84-4398-aef1-41726f7c0043');
+(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '{}', '', '', '{}', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '', '', '', '', '', '', '', '', '', '{\"privacy\":{\"activate\":\"1\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"682\"},\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"asc\"}}},\"admin_view_headers\":{\"add_admin_view_model\":\"0\",\"admin_view_model\":\"\",\"power_admin_view_model\":[],\"add_admin_view_html\":\"0\",\"admin_view_html\":\"\",\"power_admin_view_html\":[],\"add_admin_view\":\"0\",\"admin_view\":\"\",\"power_admin_view\":[],\"add_admin_view_controller\":\"0\",\"admin_view_controller\":\"\",\"power_admin_view_controller\":[],\"add_admin_views_model\":\"0\",\"admin_views_model\":\"\",\"power_admin_views_model\":[],\"add_admin_views_html\":\"0\",\"admin_views_html\":\"\",\"power_admin_views_html\":[],\"add_admin_views\":\"0\",\"admin_views\":\"\",\"power_admin_views\":[],\"add_admin_views_controller\":\"0\",\"admin_views_controller\":\"\",\"power_admin_views_controller\":[],\"add_site_admin_view_model\":\"0\",\"site_admin_view_model\":\"\",\"power_site_admin_view_model\":[],\"add_site_admin_view_html\":\"0\",\"site_admin_view_html\":\"\",\"power_site_admin_view_html\":[],\"add_site_admin_view\":\"0\",\"site_admin_view\":\"\",\"power_site_admin_view\":[],\"add_import_custom_controller\":\"0\",\"import_custom_controller\":\"\",\"power_import_custom_controller\":[],\"add_import_custom_model\":\"0\",\"import_custom_model\":\"\",\"power_import_custom_model\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', 1, '2016-10-18 11:44:46', '2024-07-25 18:06:21', 22, '', 110, 'c1053952-8a84-4398-aef1-41726f7c0043');
--
-- Dumping data for table `#__componentbuilder_site_view`
--
INSERT INTO `#__componentbuilder_site_view` (`id`, `add_css_document`, `add_css`, `add_js_document`, `add_php_document`, `add_php_jview`, `add_php_jview_display`, `add_php_view`, `add_php_ajax`, `add_custom_button`, `custom_button`, `button_position`, `php_controller`, `php_model`, `ajax_input`, `php_ajaxmethod`, `codename`, `css_document`, `css`, `custom_get`, `default`, `description`, `dynamic_get`, `js_document`, `main_get`, `name`, `system_name`, `php_document`, `php_jview`, `php_jview_display`, `php_view`, `snippet`, `params`, `javascript_file`, `libraries`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `guid`) VALUES
-(23, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'looks', '', '', '', 'PHRhYmxlIGNsYXNzPSJ1ay10YWJsZSB1ay10YWJsZS1ob3ZlciI+DQogICAgPGNhcHRpb24+PD9waHAgZWNobyBUZXh0OjpfKCdMaXN0IG9mIGFsbCBsb29rcycpOyA/PjwvY2FwdGlvbj4NCiAgICA8dGhlYWQ+DQogICAgICAgIDx0cj4NCiAgICAgICAgICAgIDx0aD48P3BocCBlY2hvIFRleHQ6Ol8oJ05hbWUnKTsgPz48L3RoPg0KICAgICAgICAgICAgPHRoPjw/cGhwIGVjaG8gVGV4dDo6XygnRGVzY3JpcHRpb24nKTsgPz48L3RoPg0KICAgICAgICA8L3RyPg0KICAgIDwvdGhlYWQ+DQogICAgPHRib2R5Pg0KICAgICAgICA8P3BocCBmb3JlYWNoICgkdGhpcy0+aXRlbXMgYXMgJGl0ZW0pOiA/Pg0KICAgICAgICA8dHI+DQogICAgICAgICAgICA8dGQ+PGEgaHJlZj0iPD9waHAgZWNobyAgW1tbQ29tcG9uZW50XV1dSGVscGVyUm91dGU6OmdldExvb2tpbmdSb3V0ZSgkaXRlbS0+c2x1Zyk7ID8+IiA+PD9waHAgZWNobyAkaXRlbS0+bmFtZTsgPz48L2E+PC90ZD4NCiAgICAgICAgICAgIDx0ZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJGl0ZW0tPmRlc2NyaXB0aW9uLCB0cnVlLCAxMjApOyA/Pjw/cGhwIGVjaG8gJGl0ZW0tPmVkaXRMaW5rOyA/PjwvdGQ+DQogICAgICAgIDwvdHI+DQogICAgICAgIDw/cGhwIGVuZGZvcmVhY2g7ID8+DQogICAgPC90Ym9keT4NCjwvdGFibGU+', 'The List of all published looks', 36, '', 36, 'Looks', 'Looks', '', '', '', '', '', '', '', '', 1, '2016-04-05 14:31:59', '2016-10-20 15:57:24', 9, '', 14, 'b2dce59e-e3b8-4467-bcb5-8f2df4bdfeb7'),
-(25, '', '', '', '', 1, 1, '', '', '', '', 1, '', '', '', '', 'looking', '', '', '', 'PGFydGljbGUgY2xhc3M9InVrLWNvbW1lbnQiPg0KICAgIDxoZWFkZXIgY2xhc3M9InVrLWNvbW1lbnQtaGVhZGVyIj4NCiAgICAgICAgPGltZyBjbGFzcz0idWstY29tbWVudC1hdmF0YXIiIHNyYz0ie2ltYWdldXJsfSIgYWx0PSIiPg0KICAgICAgICA8aDQgY2xhc3M9InVrLWNvbW1lbnQtdGl0bGUiPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+bmFtZSk7ID8+PC9oND4NCiAgICAgICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1tZXRhIj48P3BocCBlY2hvIFRleHQ6Ol8oJ0hpdHMnKTsgPz46IDw/cGhwIGVjaG8gJHRoaXMtPml0ZW0tPmhpdHM7ID8+PC9kaXY+DQogICAgPC9oZWFkZXI+DQogICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1ib2R5Ij4NCiAgICAgICAgPD9waHAgZWNobyAkdGhpcy0+aXRlbS0+ZGVzY3JpcHRpb247ID8+DQogICAgICAgIDw/cGhwIGlmICgkdGhpcy0+aXRlbS0+YWRkKTogPz4NCiAgICAgICAgICAgIDxiciAvPg0KICAgICAgICAgICAgPCEtLSBUaGlzIGlzIGEgYnV0dG9uIHRvZ2dsaW5nIHRoZSBtb2RhbCAtLT4NCiAgICAgICAgICAgIDxidXR0b24gY2xhc3M9InVrLWJ1dHRvbiIgZGF0YS11ay1tb2RhbD0ie3RhcmdldDonI21vcmUtZGV0YWlscy0wOTAnfSI+PD9waHAgZWNobyBUZXh0OjpfKCdNb3JlIERldGFpbHMnKTsgPz48L2J1dHRvbj4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgPC9kaXY+DQo8L2FydGljbGU+DQo8P3BocCBpZiAoJHRoaXMtPml0ZW0tPmFkZCk6ID8+DQo8IS0tIFRoaXMgaXMgdGhlIG1vZGFsIC0tPg0KPGRpdiBpZD0ibW9yZS1kZXRhaWxzLTA5MCIgY2xhc3M9InVrLW1vZGFsIj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay1tb2RhbC1kaWFsb2ciPg0KICAgICAgICA8YSBjbGFzcz0idWstbW9kYWwtY2xvc2UgdWstY2xvc2UiPjwvYT4NCiAgICAgICAgPGRsIGNsYXNzPSJ1ay1kZXNjcmlwdGlvbi1saXN0LWhvcml6b250YWwiPg0KICAgICAgICA8P3BocCBpZiAoU3VwZXJfX18xZjI4Y2I1M182MGQ5XzRkYjFfYjUxN18zYzdkYzZiNDI5ZWZfX19Qb3dlcjo6Y2hlY2soJHRoaXMtPml0ZW0tPmRhdGVvZmJpcnRoKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdCaXJ0aCBkYXknKTsgPz48L2R0PjxkZD48P3BocCBlY2hvIFtbW0NvbXBvbmVudF1dXUhlbHBlcjo6ZmFuY3lEYXRlKCR0aGlzLT5lc2NhcGUoJHRoaXMtPml0ZW0tPmRhdGVvZmJpcnRoKSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+ZW1haWwpKTogPz4NCiAgICAgICAgICAgIDxkdD48P3BocCBlY2hvIFRleHQ6Ol8oJ0VtYWlsJyk7ID8+PC9kdD48ZGQ+PD9waHAgZWNobyAkdGhpcy0+ZXNjYXBlKCR0aGlzLT5pdGVtLT5lbWFpbCk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+bW9iaWxlX3Bob25lKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdNb2JpbGUnKTsgPz48L2R0PjxkZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJHRoaXMtPml0ZW0tPm1vYmlsZV9waG9uZSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+d2Vic2l0ZSkpOiA/Pg0KICAgICAgICAgICAgPGR0Pjw/cGhwIGVjaG8gVGV4dDo6XygnV2Vic2l0ZScpOyA/PjwvZHQ+PGRkPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+d2Vic2l0ZSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDwvZGw+DQogICAgPC9kaXY+DQo8L2Rpdj4NCjw/cGhwIGVuZGlmOyA/Pg==', 'Looking at a look', 39, '', 39, 'Looking', 'Looking', '', 'CSAvKioNCgkgKiBJbmNyZW1lbnQgdGhlIGhpdCBjb3VudGVyIGZvciB0aGUgcHJlYWNoZXIuDQoJICoNCgkgKiBAcGFyYW0gICBpbnRlZ2VyICAkcGsgIFByaW1hcnkga2V5IG9mIHRoZSBwcmVhY2hlciB0byBpbmNyZW1lbnQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHN1Y2Nlc3NmdWw7DQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGhpdCgkcGsgPSAwKQ0KCXsNCgkJaWYgKCRwaykNCgkJew0KCQkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCQkkcXVlcnkgPSAkZGItPmdldFF1ZXJ5KHRydWUpOw0KDQoJCQkvLyBGaWVsZHMgdG8gdXBkYXRlLg0KCQkJJGZpZWxkcyA9IGFycmF5KA0KCQkJICAgICRkYi0+cXVvdGVOYW1lKCdoaXRzJykgLiAnID0gJy4kZGItPnF1b3RlTmFtZSgnaGl0cycpLicgKyAxJw0KCQkJKTsNCg0KCQkJLy8gQ29uZGl0aW9ucyBmb3Igd2hpY2ggcmVjb3JkcyBzaG91bGQgYmUgdXBkYXRlZC4NCgkJCSRjb25kaXRpb25zID0gYXJyYXkoDQoJCQkgICAgJGRiLT5xdW90ZU5hbWUoJ2lkJykgLiAnID0gJyAuICRwaw0KCQkJKTsNCg0KCQkJJHF1ZXJ5LT51cGRhdGUoJGRiLT5xdW90ZU5hbWUoJyNfX1tbW2NvbXBvbmVudF1dXV9sb29rJykpLT5zZXQoJGZpZWxkcyktPndoZXJlKCRjb25kaXRpb25zKTsNCg0KCQkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkJcmV0dXJuICRkYi0+ZXhlY3V0ZSgpOw0KCQl9DQoJCXJldHVybiBmYWxzZTsNCgl9', 'Ly8gYWRkIGEgaGl0IHRvIHRoZSBsb29rDQppZiAoJHRoaXMtPmhpdCgkdGhpcy0+aXRlbS0+aWQpKQ0Kew0KCSR0aGlzLT5pdGVtLT5oaXRzKys7DQp9', '', '', '', '', '', 1, '2016-10-20 15:11:29', '2016-10-20 17:10:58', 16, '', 14, '851ed44e-5431-4951-876f-4b62a4c56ad2');
+(23, '', '', '', '', '', '', '', '', '', '{}', '', '', '', '{}', '', 'looks', '', '', '', 'PHRhYmxlIGNsYXNzPSJ1ay10YWJsZSB1ay10YWJsZS1ob3ZlciI+DQogICAgPGNhcHRpb24+PD9waHAgZWNobyBUZXh0OjpfKCdMaXN0IG9mIGFsbCBsb29rcycpOyA/PjwvY2FwdGlvbj4NCiAgICA8dGhlYWQ+DQogICAgICAgIDx0cj4NCiAgICAgICAgICAgIDx0aD48P3BocCBlY2hvIFRleHQ6Ol8oJ05hbWUnKTsgPz48L3RoPg0KICAgICAgICAgICAgPHRoPjw/cGhwIGVjaG8gVGV4dDo6XygnRGVzY3JpcHRpb24nKTsgPz48L3RoPg0KICAgICAgICA8L3RyPg0KICAgIDwvdGhlYWQ+DQogICAgPHRib2R5Pg0KICAgICAgICA8P3BocCBmb3JlYWNoICgkdGhpcy0+aXRlbXMgYXMgJGl0ZW0pOiA/Pg0KICAgICAgICA8dHI+DQogICAgICAgICAgICA8dGQ+PGEgaHJlZj0iPD9waHAgZWNobyAgSm9vbWxhX19fOTIxNjdmMThfODU0M180MGU4XzkyYWZfMDUzZWY0YzIxMGQxX19fUG93ZXI6OmdldExvb2tpbmdSb3V0ZSgkaXRlbS0+c2x1Zyk7ID8+IiA+PD9waHAgZWNobyAkaXRlbS0+bmFtZTsgPz48L2E+PC90ZD4NCiAgICAgICAgICAgIDx0ZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJGl0ZW0tPmRlc2NyaXB0aW9uLCB0cnVlLCAxMjApOyA/Pjw/cGhwIGVjaG8gJGl0ZW0tPmVkaXRMaW5rOyA/PjwvdGQ+DQogICAgICAgIDwvdHI+DQogICAgICAgIDw/cGhwIGVuZGZvcmVhY2g7ID8+DQogICAgPC90Ym9keT4NCjwvdGFibGU+', 'The List of all published looks', 36, '', 36, 'Looks', 'Looks', '', '', '', '', '', '{\"site_view_headers\":{\"add_site_view_model\":\"0\",\"site_view_model\":\"\",\"power_site_view_model\":[],\"add_site_view_html\":\"0\",\"site_view_html\":\"\",\"power_site_view_html\":[],\"add_site_view\":\"0\",\"site_view\":\"\",\"power_site_view\":[],\"add_site_view_controller\":\"0\",\"site_view_controller\":\"\",\"power_site_view_controller\":[],\"add_site_views_model\":\"0\",\"site_views_model\":\"\",\"power_site_views_model\":[],\"add_site_views_html\":\"0\",\"site_views_html\":\"\",\"power_site_views_html\":[],\"add_site_views\":\"0\",\"site_views\":\"\",\"power_site_views\":[],\"add_site_views_controller\":\"0\",\"site_views_controller\":\"\",\"power_site_views_controller\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', '', '', 1, '2016-04-05 14:31:59', '2024-07-24 14:31:08', 11, '', 14, 'b2dce59e-e3b8-4467-bcb5-8f2df4bdfeb7'),
+(25, '', '', '', '', 1, 1, '', '', '', '{}', 1, '', '', '{}', '', 'looking', '', '', '', 'PGFydGljbGUgY2xhc3M9InVrLWNvbW1lbnQiPg0KICAgIDxoZWFkZXIgY2xhc3M9InVrLWNvbW1lbnQtaGVhZGVyIj4NCiAgICAgICAgPGltZyBjbGFzcz0idWstY29tbWVudC1hdmF0YXIiIHNyYz0ie2ltYWdldXJsfSIgYWx0PSIiPg0KICAgICAgICA8aDQgY2xhc3M9InVrLWNvbW1lbnQtdGl0bGUiPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+bmFtZSk7ID8+PC9oND4NCiAgICAgICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1tZXRhIj48P3BocCBlY2hvIFRleHQ6Ol8oJ0hpdHMnKTsgPz46IDw/cGhwIGVjaG8gJHRoaXMtPml0ZW0tPmhpdHM7ID8+PC9kaXY+DQogICAgPC9oZWFkZXI+DQogICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1ib2R5Ij4NCiAgICAgICAgPD9waHAgZWNobyAkdGhpcy0+aXRlbS0+ZGVzY3JpcHRpb247ID8+DQogICAgICAgIDw/cGhwIGlmICgkdGhpcy0+aXRlbS0+YWRkKTogPz4NCiAgICAgICAgICAgIDxiciAvPg0KICAgICAgICAgICAgPCEtLSBUaGlzIGlzIGEgYnV0dG9uIHRvZ2dsaW5nIHRoZSBtb2RhbCAtLT4NCiAgICAgICAgICAgIDxidXR0b24gY2xhc3M9InVrLWJ1dHRvbiIgdWstdG9nZ2xlPSJ0YXJnZXQ6ICNtb3JlLWRldGFpbHMtMDkwIj48P3BocCBlY2hvIFRleHQ6Ol8oJ01vcmUgRGV0YWlscycpOyA/PjwvYnV0dG9uPg0KICAgICAgICA8P3BocCBlbmRpZjsgPz4NCiAgICA8L2Rpdj4NCjwvYXJ0aWNsZT4NCjw/cGhwIGlmICgkdGhpcy0+aXRlbS0+YWRkKTogPz4NCjwhLS0gVGhpcyBpcyB0aGUgbW9kYWwgLS0+DQo8ZGl2IGlkPSJtb3JlLWRldGFpbHMtMDkwIiB1ay1tb2RhbD4NCiAgICA8ZGl2IGNsYXNzPSJ1ay1tb2RhbC1kaWFsb2cgdWstbW9kYWwtYm9keSI+DQogICAgICAgIDxidXR0b24gY2xhc3M9InVrLW1vZGFsLWNsb3NlLWRlZmF1bHQiIHR5cGU9ImJ1dHRvbiIgdWstY2xvc2U+PC9idXR0b24+DQogICAgICAgIDxkbCBjbGFzcz0idWstZGVzY3JpcHRpb24tbGlzdCB1ay1kZXNjcmlwdGlvbi1saXN0LWRpdmlkZXIiPg0KICAgICAgICA8P3BocCBpZiAoU3VwZXJfX18xZjI4Y2I1M182MGQ5XzRkYjFfYjUxN18zYzdkYzZiNDI5ZWZfX19Qb3dlcjo6Y2hlY2soJHRoaXMtPml0ZW0tPmRhdGVvZmJpcnRoKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdCaXJ0aCBkYXknKTsgPz48L2R0PjxkZD48P3BocCBlY2hvIEpvb21sYV9fX2NmM2I5NWMxX2JhNTZfNDE5M184ZWI0XzkxNjQ1ODJiN2Y1NV9fX1Bvd2VyOjpmYW5jeURhdGUoJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+ZGF0ZW9mYmlydGgpKTsgPz48L2RkPg0KICAgICAgICA8P3BocCBlbmRpZjsgPz4NCiAgICAgICAgPD9waHAgaWYgKFN1cGVyX19fMWYyOGNiNTNfNjBkOV80ZGIxX2I1MTdfM2M3ZGM2YjQyOWVmX19fUG93ZXI6OmNoZWNrKCR0aGlzLT5pdGVtLT5lbWFpbCkpOiA/Pg0KICAgICAgICAgICAgPGR0Pjw/cGhwIGVjaG8gVGV4dDo6XygnRW1haWwnKTsgPz48L2R0PjxkZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJHRoaXMtPml0ZW0tPmVtYWlsKTsgPz48L2RkPg0KICAgICAgICA8P3BocCBlbmRpZjsgPz4NCiAgICAgICAgPD9waHAgaWYgKFN1cGVyX19fMWYyOGNiNTNfNjBkOV80ZGIxX2I1MTdfM2M3ZGM2YjQyOWVmX19fUG93ZXI6OmNoZWNrKCR0aGlzLT5pdGVtLT5tb2JpbGVfcGhvbmUpKTogPz4NCiAgICAgICAgICAgIDxkdD48P3BocCBlY2hvIFRleHQ6Ol8oJ01vYmlsZScpOyA/PjwvZHQ+PGRkPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+bW9iaWxlX3Bob25lKTsgPz48L2RkPg0KICAgICAgICA8P3BocCBlbmRpZjsgPz4NCiAgICAgICAgPD9waHAgaWYgKFN1cGVyX19fMWYyOGNiNTNfNjBkOV80ZGIxX2I1MTdfM2M3ZGM2YjQyOWVmX19fUG93ZXI6OmNoZWNrKCR0aGlzLT5pdGVtLT53ZWJzaXRlKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdXZWJzaXRlJyk7ID8+PC9kdD48ZGQ+PD9waHAgZWNobyAkdGhpcy0+ZXNjYXBlKCR0aGlzLT5pdGVtLT53ZWJzaXRlKTsgPz48L2RkPg0KICAgICAgICA8P3BocCBlbmRpZjsgPz4NCiAgICAgICAgPC9kbD4NCiAgICA8L2Rpdj4NCjwvZGl2Pg0KPD9waHAgZW5kaWY7ID8+', 'Looking at a look', 39, '', 39, 'Looking', 'Looking', '', 'CSAvKioNCgkgKiBJbmNyZW1lbnQgdGhlIGhpdCBjb3VudGVyIGZvciB0aGUgcHJlYWNoZXIuDQoJICoNCgkgKiBAcGFyYW0gICBpbnRlZ2VyICAkcGsgIFByaW1hcnkga2V5IG9mIHRoZSBwcmVhY2hlciB0byBpbmNyZW1lbnQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHN1Y2Nlc3NmdWw7DQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGhpdCgkcGsgPSAwKQ0KCXsNCgkJaWYgKCRwaykNCgkJew0KCQkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCQkkcXVlcnkgPSAkZGItPmdldFF1ZXJ5KHRydWUpOw0KDQoJCQkvLyBGaWVsZHMgdG8gdXBkYXRlLg0KCQkJJGZpZWxkcyA9IGFycmF5KA0KCQkJICAgICRkYi0+cXVvdGVOYW1lKCdoaXRzJykgLiAnID0gJy4kZGItPnF1b3RlTmFtZSgnaGl0cycpLicgKyAxJw0KCQkJKTsNCg0KCQkJLy8gQ29uZGl0aW9ucyBmb3Igd2hpY2ggcmVjb3JkcyBzaG91bGQgYmUgdXBkYXRlZC4NCgkJCSRjb25kaXRpb25zID0gYXJyYXkoDQoJCQkgICAgJGRiLT5xdW90ZU5hbWUoJ2lkJykgLiAnID0gJyAuICRwaw0KCQkJKTsNCg0KCQkJJHF1ZXJ5LT51cGRhdGUoJGRiLT5xdW90ZU5hbWUoJyNfX1tbW2NvbXBvbmVudF1dXV9sb29rJykpLT5zZXQoJGZpZWxkcyktPndoZXJlKCRjb25kaXRpb25zKTsNCg0KCQkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkJcmV0dXJuICRkYi0+ZXhlY3V0ZSgpOw0KCQl9DQoJCXJldHVybiBmYWxzZTsNCgl9', 'Ly8gYWRkIGEgaGl0IHRvIHRoZSBsb29rDQppZiAoJHRoaXMtPmhpdCgkdGhpcy0+aXRlbS0+aWQpKQ0Kew0KCSR0aGlzLT5pdGVtLT5oaXRzKys7DQp9', '', '', '{\"site_view_headers\":{\"add_site_view_model\":\"0\",\"site_view_model\":\"\",\"power_site_view_model\":[],\"add_site_view_html\":\"0\",\"site_view_html\":\"\",\"power_site_view_html\":[],\"add_site_view\":\"0\",\"site_view\":\"\",\"power_site_view\":[],\"add_site_view_controller\":\"0\",\"site_view_controller\":\"\",\"power_site_view_controller\":[],\"add_site_views_model\":\"0\",\"site_views_model\":\"\",\"power_site_views_model\":[],\"add_site_views_html\":\"0\",\"site_views_html\":\"\",\"power_site_views_html\":[],\"add_site_views\":\"0\",\"site_views\":\"\",\"power_site_views\":[],\"add_site_views_controller\":\"0\",\"site_views_controller\":\"\",\"power_site_views_controller\":[],\"add_ajax_model\":\"0\",\"ajax_model\":\"\",\"power_ajax_model\":[]}}', '', '', 1, '2016-10-20 15:11:29', '2024-07-24 14:52:19', 19, '', 14, '851ed44e-5431-4951-876f-4b62a4c56ad2');
--
-- Dumping data for table `#__componentbuilder_layout`
@@ -2627,7 +2627,7 @@ INSERT INTO `#__componentbuilder_library_config` (`id`, `addconfig`, `library`,
INSERT INTO `#__componentbuilder_library_files_folders_urls` (`id`, `addfiles`, `addfolders`, `addurls`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
(2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"2\"}}', 2, '', 1, '2017-11-25 16:17:36', '2018-05-02 23:29:05', 11, '', 2),
-(3, '{}', '{}', '{\"addurls2\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.6.22\\/dist\\/css\\/uikit.min.css\",\"type\":2},\"addurls0\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.6.22\\/dist\\/js\\/uikit.min.js\",\"type\":2},\"addurls1\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.6.22\\/dist\\/js\\/uikit-icons.min.js\",\"type\":2}}', 3, '', 1, '2017-11-25 21:47:40', '2021-05-27 00:16:34', 11, '', 3),
+(3, '{}', '{}', '{\"addurls0\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.21.7\\/dist\\/css\\/uikit.min.css\",\"type\":2},\"addurls1\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.21.7\\/dist\\/js\\/uikit.min.js\",\"type\":2},\"addurls2\":{\"url\":\"https:\\/\\/cdn.jsdelivr.net\\/npm\\/uikit@3.21.7\\/dist\\/js\\/uikit-icons.min.js\",\"type\":2}}', 3, '', 1, '2017-11-25 21:47:40', '2024-07-24 15:01:17', 12, '', 3),
(4, '{}', '{\"addfolders0\":{\"folder\":\"file_icon_vectors\",\"path\":\"\\/media\\/vector\",\"rename\":\"1\"}}', '{}', 7, '', 1, '2019-10-03 09:24:30', '2019-10-03 09:25:39', 2, '', 4),
(5, '{}', '{}', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/grapesjs\\/0.14.15\\/css\\/grapes.min.css\",\"type\":2},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/grapesjs\\/0.14.15\\/grapes.min.js\",\"type\":2}}', 8, '', 1, '2020-02-10 21:34:33', '2020-02-18 21:12:35', 5, '', 5),
(6, '{}', '{}', '{\"addurls0\":{\"url\":\"https:\\/\\/raw.githubusercontent.com\\/artf\\/grapesjs-preset-webpage\\/master\\/dist\\/grapesjs-preset-webpage.min.css\",\"type\":2},\"addurls1\":{\"url\":\"https:\\/\\/raw.githubusercontent.com\\/artf\\/grapesjs-preset-webpage\\/master\\/dist\\/grapesjs-preset-webpage.min.js\",\"type\":2},\"addurls2\":{\"url\":\"https:\\/\\/static.filestackapi.com\\/v3\\/filestack-0.1.10.js\",\"type\":2}}', 9, '', 1, '2020-02-18 21:13:16', '2020-02-18 21:14:11', 2, '', 5),
diff --git a/admin/sql/updates/mysql/4.0.1.sql b/admin/sql/updates/mysql/4.0.1.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/admin/sql/updates/mysql/4.0.1.sql
@@ -0,0 +1 @@
+
diff --git a/admin/src/View/Admin_custom_tabs/HtmlView.php b/admin/src/View/Admin_custom_tabs/HtmlView.php
index dc63152cf..32d85f3f0 100644
--- a/admin/src/View/Admin_custom_tabs/HtmlView.php
+++ b/admin/src/View/Admin_custom_tabs/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Admin_custom_tabs view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Admin_fields/HtmlView.php b/admin/src/View/Admin_fields/HtmlView.php
index f23147b20..ee9aa750c 100644
--- a/admin/src/View/Admin_fields/HtmlView.php
+++ b/admin/src/View/Admin_fields/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Admin_fields view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Admin_fields_conditions/HtmlView.php b/admin/src/View/Admin_fields_conditions/HtmlView.php
index dcc1ce80a..bac858732 100644
--- a/admin/src/View/Admin_fields_conditions/HtmlView.php
+++ b/admin/src/View/Admin_fields_conditions/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Admin_fields_conditions view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Admin_fields_relations/HtmlView.php b/admin/src/View/Admin_fields_relations/HtmlView.php
index d1ca0a315..4732058c6 100644
--- a/admin/src/View/Admin_fields_relations/HtmlView.php
+++ b/admin/src/View/Admin_fields_relations/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Admin_fields_relations view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Admin_view/HtmlView.php b/admin/src/View/Admin_view/HtmlView.php
index d0c0bc19b..3f2ca656e 100644
--- a/admin/src/View/Admin_view/HtmlView.php
+++ b/admin/src/View/Admin_view/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Admin_view view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Admin_views/HtmlView.php b/admin/src/View/Admin_views/HtmlView.php
index 5a249edd8..447ef1e31 100644
--- a/admin/src/View/Admin_views/HtmlView.php
+++ b/admin/src/View/Admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Admin_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Admins_custom_tabs/HtmlView.php b/admin/src/View/Admins_custom_tabs/HtmlView.php
index bb875a5ee..30bdbd9c6 100644
--- a/admin/src/View/Admins_custom_tabs/HtmlView.php
+++ b/admin/src/View/Admins_custom_tabs/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Admins_custom_tabs view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Admins_fields/HtmlView.php b/admin/src/View/Admins_fields/HtmlView.php
index 3b0a3fdcb..65f0ab5bb 100644
--- a/admin/src/View/Admins_fields/HtmlView.php
+++ b/admin/src/View/Admins_fields/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Admins_fields view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Admins_fields_conditions/HtmlView.php b/admin/src/View/Admins_fields_conditions/HtmlView.php
index 1120bbaae..26a5fbab1 100644
--- a/admin/src/View/Admins_fields_conditions/HtmlView.php
+++ b/admin/src/View/Admins_fields_conditions/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Admins_fields_conditions view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Admins_fields_relations/HtmlView.php b/admin/src/View/Admins_fields_relations/HtmlView.php
index 9582c17bd..1fb50fab9 100644
--- a/admin/src/View/Admins_fields_relations/HtmlView.php
+++ b/admin/src/View/Admins_fields_relations/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Admins_fields_relations view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Class_extendings/HtmlView.php b/admin/src/View/Class_extendings/HtmlView.php
index a907310d7..0e40f9b30 100644
--- a/admin/src/View/Class_extendings/HtmlView.php
+++ b/admin/src/View/Class_extendings/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Class_extendings view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Class_extends/HtmlView.php b/admin/src/View/Class_extends/HtmlView.php
index c7e3e5005..17119335b 100644
--- a/admin/src/View/Class_extends/HtmlView.php
+++ b/admin/src/View/Class_extends/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Class_extends view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Class_method/HtmlView.php b/admin/src/View/Class_method/HtmlView.php
index dc1930635..fced2f856 100644
--- a/admin/src/View/Class_method/HtmlView.php
+++ b/admin/src/View/Class_method/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Class_method view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Class_methods/HtmlView.php b/admin/src/View/Class_methods/HtmlView.php
index 52d3a5204..f89130155 100644
--- a/admin/src/View/Class_methods/HtmlView.php
+++ b/admin/src/View/Class_methods/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Class_methods view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Class_properties/HtmlView.php b/admin/src/View/Class_properties/HtmlView.php
index 18fc993d2..94168c823 100644
--- a/admin/src/View/Class_properties/HtmlView.php
+++ b/admin/src/View/Class_properties/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Class_properties view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Class_property/HtmlView.php b/admin/src/View/Class_property/HtmlView.php
index 3d174a093..239a2a268 100644
--- a/admin/src/View/Class_property/HtmlView.php
+++ b/admin/src/View/Class_property/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Class_property view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Compiler/HtmlView.php b/admin/src/View/Compiler/HtmlView.php
index 0b41f68d9..f507ff031 100644
--- a/admin/src/View/Compiler/HtmlView.php
+++ b/admin/src/View/Compiler/HtmlView.php
@@ -27,6 +27,7 @@ use Joomla\CMS\Layout\LayoutHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\FormHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -38,6 +39,38 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Display the view
*
@@ -53,11 +86,11 @@ class HtmlView extends BaseHtmlView
// get the application
$this->app ??= Factory::getApplication();
// get the user object
- $this->user ??= $this->app->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('compiler');
- $this->styles = $this->get('Styles');
- $this->scripts = $this->get('Scripts');
+ $this->styles = $this->get('Styles') ?? [];
+ $this->scripts = $this->get('Scripts') ?? [];
// Initialise variables.
$this->items = $this->get('Items');
// get the success message if set
diff --git a/admin/src/View/Component_admin_views/HtmlView.php b/admin/src/View/Component_admin_views/HtmlView.php
index 6535f01be..0761c9226 100644
--- a/admin/src/View/Component_admin_views/HtmlView.php
+++ b/admin/src/View/Component_admin_views/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_admin_views view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_config/HtmlView.php b/admin/src/View/Component_config/HtmlView.php
index 98e392263..e8ef05c49 100644
--- a/admin/src/View/Component_config/HtmlView.php
+++ b/admin/src/View/Component_config/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_config view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_custom_admin_menus/HtmlView.php b/admin/src/View/Component_custom_admin_menus/HtmlView.php
index 74815e200..04b875996 100644
--- a/admin/src/View/Component_custom_admin_menus/HtmlView.php
+++ b/admin/src/View/Component_custom_admin_menus/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_custom_admin_menus view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_custom_admin_views/HtmlView.php b/admin/src/View/Component_custom_admin_views/HtmlView.php
index 333f991db..d1f9038ca 100644
--- a/admin/src/View/Component_custom_admin_views/HtmlView.php
+++ b/admin/src/View/Component_custom_admin_views/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_custom_admin_views view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_dashboard/HtmlView.php b/admin/src/View/Component_dashboard/HtmlView.php
index 1326cceaa..45f34a83e 100644
--- a/admin/src/View/Component_dashboard/HtmlView.php
+++ b/admin/src/View/Component_dashboard/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_dashboard view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_files_folders/HtmlView.php b/admin/src/View/Component_files_folders/HtmlView.php
index ea1b694d6..2a1d43857 100644
--- a/admin/src/View/Component_files_folders/HtmlView.php
+++ b/admin/src/View/Component_files_folders/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_files_folders view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_modules/HtmlView.php b/admin/src/View/Component_modules/HtmlView.php
index a43affa07..d67a3fcc7 100644
--- a/admin/src/View/Component_modules/HtmlView.php
+++ b/admin/src/View/Component_modules/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_modules view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_mysql_tweaks/HtmlView.php b/admin/src/View/Component_mysql_tweaks/HtmlView.php
index caa8980a2..f1df01e29 100644
--- a/admin/src/View/Component_mysql_tweaks/HtmlView.php
+++ b/admin/src/View/Component_mysql_tweaks/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_mysql_tweaks view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_placeholders/HtmlView.php b/admin/src/View/Component_placeholders/HtmlView.php
index 54695b3c4..fdafa8a01 100644
--- a/admin/src/View/Component_placeholders/HtmlView.php
+++ b/admin/src/View/Component_placeholders/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_placeholders view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_plugins/HtmlView.php b/admin/src/View/Component_plugins/HtmlView.php
index ddeaaa997..f43c0a649 100644
--- a/admin/src/View/Component_plugins/HtmlView.php
+++ b/admin/src/View/Component_plugins/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_plugins view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_router/HtmlView.php b/admin/src/View/Component_router/HtmlView.php
index cb689b998..00a430c67 100644
--- a/admin/src/View/Component_router/HtmlView.php
+++ b/admin/src/View/Component_router/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_router view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_site_views/HtmlView.php b/admin/src/View/Component_site_views/HtmlView.php
index 984ca338d..f4e09f73a 100644
--- a/admin/src/View/Component_site_views/HtmlView.php
+++ b/admin/src/View/Component_site_views/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_site_views view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Component_updates/HtmlView.php b/admin/src/View/Component_updates/HtmlView.php
index 7f1563600..36c059e8a 100644
--- a/admin/src/View/Component_updates/HtmlView.php
+++ b/admin/src/View/Component_updates/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Component_updates view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Components_admin_views/HtmlView.php b/admin/src/View/Components_admin_views/HtmlView.php
index 80a956552..88b87b05c 100644
--- a/admin/src/View/Components_admin_views/HtmlView.php
+++ b/admin/src/View/Components_admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_admin_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_config/HtmlView.php b/admin/src/View/Components_config/HtmlView.php
index a29b16f66..1c8451298 100644
--- a/admin/src/View/Components_config/HtmlView.php
+++ b/admin/src/View/Components_config/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_config view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_custom_admin_menus/HtmlView.php b/admin/src/View/Components_custom_admin_menus/HtmlView.php
index 6e2448ea4..2c8ed4101 100644
--- a/admin/src/View/Components_custom_admin_menus/HtmlView.php
+++ b/admin/src/View/Components_custom_admin_menus/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_custom_admin_menus view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_custom_admin_views/HtmlView.php b/admin/src/View/Components_custom_admin_views/HtmlView.php
index 3a4222d5d..a2ff2ea73 100644
--- a/admin/src/View/Components_custom_admin_views/HtmlView.php
+++ b/admin/src/View/Components_custom_admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_custom_admin_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_dashboard/HtmlView.php b/admin/src/View/Components_dashboard/HtmlView.php
index 48e3c78eb..1507a8951 100644
--- a/admin/src/View/Components_dashboard/HtmlView.php
+++ b/admin/src/View/Components_dashboard/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_dashboard view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_files_folders/HtmlView.php b/admin/src/View/Components_files_folders/HtmlView.php
index 0754dc6f5..8313f86c1 100644
--- a/admin/src/View/Components_files_folders/HtmlView.php
+++ b/admin/src/View/Components_files_folders/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_files_folders view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_modules/HtmlView.php b/admin/src/View/Components_modules/HtmlView.php
index 513fd0ece..98db0df9a 100644
--- a/admin/src/View/Components_modules/HtmlView.php
+++ b/admin/src/View/Components_modules/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_modules view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_mysql_tweaks/HtmlView.php b/admin/src/View/Components_mysql_tweaks/HtmlView.php
index f46d56d93..e5bb3b847 100644
--- a/admin/src/View/Components_mysql_tweaks/HtmlView.php
+++ b/admin/src/View/Components_mysql_tweaks/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_mysql_tweaks view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_placeholders/HtmlView.php b/admin/src/View/Components_placeholders/HtmlView.php
index c203408c2..7caf385bf 100644
--- a/admin/src/View/Components_placeholders/HtmlView.php
+++ b/admin/src/View/Components_placeholders/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_placeholders view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_plugins/HtmlView.php b/admin/src/View/Components_plugins/HtmlView.php
index f49a57e6a..57203f79d 100644
--- a/admin/src/View/Components_plugins/HtmlView.php
+++ b/admin/src/View/Components_plugins/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_plugins view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_routers/HtmlView.php b/admin/src/View/Components_routers/HtmlView.php
index ba03720bc..fc454922b 100644
--- a/admin/src/View/Components_routers/HtmlView.php
+++ b/admin/src/View/Components_routers/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_routers view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_site_views/HtmlView.php b/admin/src/View/Components_site_views/HtmlView.php
index 2d0890f98..bfdede608 100644
--- a/admin/src/View/Components_site_views/HtmlView.php
+++ b/admin/src/View/Components_site_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_site_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Components_updates/HtmlView.php b/admin/src/View/Components_updates/HtmlView.php
index 109f2daa1..086d5acfa 100644
--- a/admin/src/View/Components_updates/HtmlView.php
+++ b/admin/src/View/Components_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Components_updates view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Custom_admin_view/HtmlView.php b/admin/src/View/Custom_admin_view/HtmlView.php
index e281c8780..0e40e0e43 100644
--- a/admin/src/View/Custom_admin_view/HtmlView.php
+++ b/admin/src/View/Custom_admin_view/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Custom_admin_view view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Custom_admin_views/HtmlView.php b/admin/src/View/Custom_admin_views/HtmlView.php
index 260230d38..7027d19c5 100644
--- a/admin/src/View/Custom_admin_views/HtmlView.php
+++ b/admin/src/View/Custom_admin_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Custom_admin_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Custom_code/HtmlView.php b/admin/src/View/Custom_code/HtmlView.php
index 8878245a8..131df6a9a 100644
--- a/admin/src/View/Custom_code/HtmlView.php
+++ b/admin/src/View/Custom_code/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Custom_code view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Custom_codes/HtmlView.php b/admin/src/View/Custom_codes/HtmlView.php
index d5dacdb39..4894e4388 100644
--- a/admin/src/View/Custom_codes/HtmlView.php
+++ b/admin/src/View/Custom_codes/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Custom_codes view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Dynamic_get/HtmlView.php b/admin/src/View/Dynamic_get/HtmlView.php
index 80413ab88..795279494 100644
--- a/admin/src/View/Dynamic_get/HtmlView.php
+++ b/admin/src/View/Dynamic_get/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Dynamic_get view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Dynamic_gets/HtmlView.php b/admin/src/View/Dynamic_gets/HtmlView.php
index c37b43a4e..c1928c3d7 100644
--- a/admin/src/View/Dynamic_gets/HtmlView.php
+++ b/admin/src/View/Dynamic_gets/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Dynamic_gets view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Field/HtmlView.php b/admin/src/View/Field/HtmlView.php
index 344b50e2b..e4d9edd28 100644
--- a/admin/src/View/Field/HtmlView.php
+++ b/admin/src/View/Field/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Field view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Fields/HtmlView.php b/admin/src/View/Fields/HtmlView.php
index 4e543f8bd..4fce640df 100644
--- a/admin/src/View/Fields/HtmlView.php
+++ b/admin/src/View/Fields/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Fields view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Fieldtype/HtmlView.php b/admin/src/View/Fieldtype/HtmlView.php
index a21438115..757ba9c15 100644
--- a/admin/src/View/Fieldtype/HtmlView.php
+++ b/admin/src/View/Fieldtype/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Fieldtype view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Fieldtypes/HtmlView.php b/admin/src/View/Fieldtypes/HtmlView.php
index be6f3563b..b7d4dde47 100644
--- a/admin/src/View/Fieldtypes/HtmlView.php
+++ b/admin/src/View/Fieldtypes/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Fieldtypes view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Get_snippets/HtmlView.php b/admin/src/View/Get_snippets/HtmlView.php
index a635c85fd..561cfc047 100644
--- a/admin/src/View/Get_snippets/HtmlView.php
+++ b/admin/src/View/Get_snippets/HtmlView.php
@@ -24,6 +24,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use Joomla\CMS\Filesystem\File;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
use Joomla\CMS\Session\Session;
// No direct access to this file
@@ -36,6 +37,38 @@ use Joomla\CMS\Session\Session;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Display the view
*
@@ -51,11 +84,11 @@ class HtmlView extends BaseHtmlView
// get the application
$this->app ??= Factory::getApplication();
// get the user object
- $this->user ??= $this->app->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('get_snippets');
- $this->styles = $this->get('Styles');
- $this->scripts = $this->get('Scripts');
+ $this->styles = $this->get('Styles') ?? [];
+ $this->scripts = $this->get('Scripts') ?? [];
// Initialise variables.
$this->items = $this->get('Items');
diff --git a/admin/src/View/Help_document/HtmlView.php b/admin/src/View/Help_document/HtmlView.php
index 3626fac8e..1b986510f 100644
--- a/admin/src/View/Help_document/HtmlView.php
+++ b/admin/src/View/Help_document/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Help_document view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Help_documents/HtmlView.php b/admin/src/View/Help_documents/HtmlView.php
index dd0e95191..536591360 100644
--- a/admin/src/View/Help_documents/HtmlView.php
+++ b/admin/src/View/Help_documents/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Help_documents view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_component/HtmlView.php b/admin/src/View/Joomla_component/HtmlView.php
index 925a097b5..95fd91a97 100644
--- a/admin/src/View/Joomla_component/HtmlView.php
+++ b/admin/src/View/Joomla_component/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_component view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_components/HtmlView.php b/admin/src/View/Joomla_components/HtmlView.php
index 1ace0467b..8871e210a 100644
--- a/admin/src/View/Joomla_components/HtmlView.php
+++ b/admin/src/View/Joomla_components/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_components view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_module/HtmlView.php b/admin/src/View/Joomla_module/HtmlView.php
index af80d8513..6d653c455 100644
--- a/admin/src/View/Joomla_module/HtmlView.php
+++ b/admin/src/View/Joomla_module/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_module view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
index 8151f0d3e..6f6dd7cc5 100644
--- a/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_module_files_folders_urls/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_module_files_folders_urls view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_module_updates/HtmlView.php b/admin/src/View/Joomla_module_updates/HtmlView.php
index 8cb2c181e..3536093de 100644
--- a/admin/src/View/Joomla_module_updates/HtmlView.php
+++ b/admin/src/View/Joomla_module_updates/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_module_updates view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_modules/HtmlView.php b/admin/src/View/Joomla_modules/HtmlView.php
index 52b783f01..5a7d2d5ba 100644
--- a/admin/src/View/Joomla_modules/HtmlView.php
+++ b/admin/src/View/Joomla_modules/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_modules view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
index b1664093d..96543924c 100644
--- a/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_modules_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_modules_files_folders_urls view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_modules_updates/HtmlView.php b/admin/src/View/Joomla_modules_updates/HtmlView.php
index 59614f1b0..f08a5e1d2 100644
--- a/admin/src/View/Joomla_modules_updates/HtmlView.php
+++ b/admin/src/View/Joomla_modules_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_modules_updates view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_plugin/HtmlView.php b/admin/src/View/Joomla_plugin/HtmlView.php
index cd705d002..7a58926dc 100644
--- a/admin/src/View/Joomla_plugin/HtmlView.php
+++ b/admin/src/View/Joomla_plugin/HtmlView.php
@@ -37,6 +37,86 @@ use VDM\Joomla\Utilities\ArrayHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_plugin view display method
*
@@ -51,7 +131,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
index 06ece7e32..1529606ca 100644
--- a/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_files_folders_urls/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_plugin_files_folders_urls view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_plugin_group/HtmlView.php b/admin/src/View/Joomla_plugin_group/HtmlView.php
index 9e956e40b..d1d057042 100644
--- a/admin/src/View/Joomla_plugin_group/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_group/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_plugin_group view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_plugin_groups/HtmlView.php b/admin/src/View/Joomla_plugin_groups/HtmlView.php
index efaac6bee..144beb687 100644
--- a/admin/src/View/Joomla_plugin_groups/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_groups/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_plugin_groups view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_plugin_updates/HtmlView.php b/admin/src/View/Joomla_plugin_updates/HtmlView.php
index 4e5e1f434..386e29770 100644
--- a/admin/src/View/Joomla_plugin_updates/HtmlView.php
+++ b/admin/src/View/Joomla_plugin_updates/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_plugin_updates view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_plugins/HtmlView.php b/admin/src/View/Joomla_plugins/HtmlView.php
index 23442df88..babc79564 100644
--- a/admin/src/View/Joomla_plugins/HtmlView.php
+++ b/admin/src/View/Joomla_plugins/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_plugins view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php b/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
index af9daddac..20656d555 100644
--- a/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Joomla_plugins_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_plugins_files_folders_urls view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_plugins_updates/HtmlView.php b/admin/src/View/Joomla_plugins_updates/HtmlView.php
index 5f062b632..661208a7e 100644
--- a/admin/src/View/Joomla_plugins_updates/HtmlView.php
+++ b/admin/src/View/Joomla_plugins_updates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_plugins_updates view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Joomla_power/HtmlView.php b/admin/src/View/Joomla_power/HtmlView.php
index 49a7b5480..f042ba319 100644
--- a/admin/src/View/Joomla_power/HtmlView.php
+++ b/admin/src/View/Joomla_power/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Joomla_power view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Joomla_powers/HtmlView.php b/admin/src/View/Joomla_powers/HtmlView.php
index 819e74528..f7700401f 100644
--- a/admin/src/View/Joomla_powers/HtmlView.php
+++ b/admin/src/View/Joomla_powers/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Joomla_powers view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Language/HtmlView.php b/admin/src/View/Language/HtmlView.php
index 7b1c0cee4..252d3d050 100644
--- a/admin/src/View/Language/HtmlView.php
+++ b/admin/src/View/Language/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Language view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Language_translation/HtmlView.php b/admin/src/View/Language_translation/HtmlView.php
index 7488da3ee..036621478 100644
--- a/admin/src/View/Language_translation/HtmlView.php
+++ b/admin/src/View/Language_translation/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Language_translation view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Language_translations/HtmlView.php b/admin/src/View/Language_translations/HtmlView.php
index c7a0eb23a..a46f2e45f 100644
--- a/admin/src/View/Language_translations/HtmlView.php
+++ b/admin/src/View/Language_translations/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Language_translations view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Languages/HtmlView.php b/admin/src/View/Languages/HtmlView.php
index 7f9907a27..9e6cbf42e 100644
--- a/admin/src/View/Languages/HtmlView.php
+++ b/admin/src/View/Languages/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Languages view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Layout/HtmlView.php b/admin/src/View/Layout/HtmlView.php
index f78bb0f39..b858683bd 100644
--- a/admin/src/View/Layout/HtmlView.php
+++ b/admin/src/View/Layout/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Layout view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Layouts/HtmlView.php b/admin/src/View/Layouts/HtmlView.php
index 7516ef8d3..44c5cf32c 100644
--- a/admin/src/View/Layouts/HtmlView.php
+++ b/admin/src/View/Layouts/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Layouts view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Libraries/HtmlView.php b/admin/src/View/Libraries/HtmlView.php
index 5afc96567..6ecf548c7 100644
--- a/admin/src/View/Libraries/HtmlView.php
+++ b/admin/src/View/Libraries/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Libraries view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Libraries_config/HtmlView.php b/admin/src/View/Libraries_config/HtmlView.php
index a8e21b1c5..d2b0a9006 100644
--- a/admin/src/View/Libraries_config/HtmlView.php
+++ b/admin/src/View/Libraries_config/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Libraries_config view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Libraries_files_folders_urls/HtmlView.php b/admin/src/View/Libraries_files_folders_urls/HtmlView.php
index 57d180ed7..44aad3f4d 100644
--- a/admin/src/View/Libraries_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Libraries_files_folders_urls/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Libraries_files_folders_urls view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Library/HtmlView.php b/admin/src/View/Library/HtmlView.php
index 760f6c9c5..9a9d7c3fb 100644
--- a/admin/src/View/Library/HtmlView.php
+++ b/admin/src/View/Library/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Library view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Library_config/HtmlView.php b/admin/src/View/Library_config/HtmlView.php
index 89c1c6fed..55da15046 100644
--- a/admin/src/View/Library_config/HtmlView.php
+++ b/admin/src/View/Library_config/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Library_config view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Library_files_folders_urls/HtmlView.php b/admin/src/View/Library_files_folders_urls/HtmlView.php
index b6cb94f05..ef5cef6c2 100644
--- a/admin/src/View/Library_files_folders_urls/HtmlView.php
+++ b/admin/src/View/Library_files_folders_urls/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Library_files_folders_urls view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Placeholder/HtmlView.php b/admin/src/View/Placeholder/HtmlView.php
index 671b32d62..473aa32d2 100644
--- a/admin/src/View/Placeholder/HtmlView.php
+++ b/admin/src/View/Placeholder/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Placeholder view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Placeholders/HtmlView.php b/admin/src/View/Placeholders/HtmlView.php
index ee7c7a7b2..8a5276050 100644
--- a/admin/src/View/Placeholders/HtmlView.php
+++ b/admin/src/View/Placeholders/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Placeholders view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Power/HtmlView.php b/admin/src/View/Power/HtmlView.php
index 9cc29ec68..7387437fd 100644
--- a/admin/src/View/Power/HtmlView.php
+++ b/admin/src/View/Power/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Power view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Powers/HtmlView.php b/admin/src/View/Powers/HtmlView.php
index 8decff35f..d1f06f8db 100644
--- a/admin/src/View/Powers/HtmlView.php
+++ b/admin/src/View/Powers/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Powers view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Repositories/HtmlView.php b/admin/src/View/Repositories/HtmlView.php
index ccdfc8b76..037b889aa 100644
--- a/admin/src/View/Repositories/HtmlView.php
+++ b/admin/src/View/Repositories/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Repositories view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Repository/HtmlView.php b/admin/src/View/Repository/HtmlView.php
index cf20a111a..a4da83ddb 100644
--- a/admin/src/View/Repository/HtmlView.php
+++ b/admin/src/View/Repository/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Repository view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Server/HtmlView.php b/admin/src/View/Server/HtmlView.php
index 4d3ac65bc..d8645a4f9 100644
--- a/admin/src/View/Server/HtmlView.php
+++ b/admin/src/View/Server/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Server view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Servers/HtmlView.php b/admin/src/View/Servers/HtmlView.php
index 52e3ac2d0..c14fb93b9 100644
--- a/admin/src/View/Servers/HtmlView.php
+++ b/admin/src/View/Servers/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Servers view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Site_view/HtmlView.php b/admin/src/View/Site_view/HtmlView.php
index a3e974711..267beb629 100644
--- a/admin/src/View/Site_view/HtmlView.php
+++ b/admin/src/View/Site_view/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Site_view view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Site_views/HtmlView.php b/admin/src/View/Site_views/HtmlView.php
index d8598185b..b0fda91db 100644
--- a/admin/src/View/Site_views/HtmlView.php
+++ b/admin/src/View/Site_views/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Site_views view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Snippet/HtmlView.php b/admin/src/View/Snippet/HtmlView.php
index 4c7707eed..fd9338191 100644
--- a/admin/src/View/Snippet/HtmlView.php
+++ b/admin/src/View/Snippet/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Snippet view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Snippet_type/HtmlView.php b/admin/src/View/Snippet_type/HtmlView.php
index 8b40bbc51..7458e6998 100644
--- a/admin/src/View/Snippet_type/HtmlView.php
+++ b/admin/src/View/Snippet_type/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Snippet_type view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Snippet_types/HtmlView.php b/admin/src/View/Snippet_types/HtmlView.php
index 1a021bf00..1b38b240d 100644
--- a/admin/src/View/Snippet_types/HtmlView.php
+++ b/admin/src/View/Snippet_types/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Snippet_types view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Snippets/HtmlView.php b/admin/src/View/Snippets/HtmlView.php
index 5c99ce54b..fa4e2aad8 100644
--- a/admin/src/View/Snippets/HtmlView.php
+++ b/admin/src/View/Snippets/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Snippets view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Template/HtmlView.php b/admin/src/View/Template/HtmlView.php
index 8e449b308..3130d5070 100644
--- a/admin/src/View/Template/HtmlView.php
+++ b/admin/src/View/Template/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Template view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Templates/HtmlView.php b/admin/src/View/Templates/HtmlView.php
index 9d5854704..638ff2998 100644
--- a/admin/src/View/Templates/HtmlView.php
+++ b/admin/src/View/Templates/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Templates view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/src/View/Validation_rule/HtmlView.php b/admin/src/View/Validation_rule/HtmlView.php
index 767cf3074..7d68ac790 100644
--- a/admin/src/View/Validation_rule/HtmlView.php
+++ b/admin/src/View/Validation_rule/HtmlView.php
@@ -36,6 +36,86 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The item from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $item;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The form from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $form;
+
+ /**
+ * The toolbar object
+ *
+ * @var Toolbar
+ * @since 3.10.11
+ */
+ public Toolbar $toolbar;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The origin referral view name
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $ref;
+
+ /**
+ * The origin referral item id
+ *
+ * @var int
+ * @since 3.10.11
+ */
+ public int $refid;
+
+ /**
+ * The referral url suffix values
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $referral;
+
/**
* Validation_rule view display method
*
@@ -50,7 +130,7 @@ class HtmlView extends BaseHtmlView
$this->params = ComponentHelper::getParams('com_componentbuilder');
$this->useCoreUI = true;
// Assign the variables
- $this->form = $this->get('Form');
+ $this->form ??= $this->get('Form');
$this->item = $this->get('Item');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
diff --git a/admin/src/View/Validation_rules/HtmlView.php b/admin/src/View/Validation_rules/HtmlView.php
index f3cb4f5af..64b23d86a 100644
--- a/admin/src/View/Validation_rules/HtmlView.php
+++ b/admin/src/View/Validation_rules/HtmlView.php
@@ -26,6 +26,7 @@ use Joomla\CMS\Document\Document;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\User\User;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -37,6 +38,62 @@ use VDM\Joomla\Utilities\StringHelper;
*/
class HtmlView extends BaseHtmlView
{
+ /**
+ * The items from the model
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $items;
+
+ /**
+ * The state object
+ *
+ * @var mixed
+ * @since 3.10.11
+ */
+ public mixed $state;
+
+ /**
+ * The styles url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $styles;
+
+ /**
+ * The scripts url array
+ *
+ * @var array
+ * @since 5.0.0
+ */
+ protected array $scripts;
+
+ /**
+ * The actions object
+ *
+ * @var object
+ * @since 3.10.11
+ */
+ public object $canDo;
+
+ /**
+ * The return here base64 url
+ *
+ * @var string
+ * @since 3.10.11
+ */
+ public string $return_here;
+
+ /**
+ * The user object.
+ *
+ * @var User
+ * @since 3.10.11
+ */
+ public User $user;
+
/**
* Validation_rules view display method
*
@@ -53,7 +110,7 @@ class HtmlView extends BaseHtmlView
$this->state = $this->get('State');
$this->styles = $this->get('Styles');
$this->scripts = $this->get('Scripts');
- $this->user ??= Factory::getApplication()->getIdentity();
+ $this->user ??= $this->getCurrentUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
diff --git a/admin/tmpl/admin_custom_tabs/default.php b/admin/tmpl/admin_custom_tabs/default.php
index 598c0d812..98c9043e0 100644
--- a/admin/tmpl/admin_custom_tabs/default.php
+++ b/admin/tmpl/admin_custom_tabs/default.php
@@ -79,14 +79,10 @@ defined('_JEXEC') or die;