Release of v4.0.4-alpha2

Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run. Added new import powers for custom import of spreadsheets. Move the setDocument and _prepareDocument above the display in the site view and custom admin view. Update the trashhelper layout to work in Joomla 5. Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
This commit is contained in:
Robot 2024-10-08 00:32:35 +02:00
parent bfbf3de001
commit 47e47ee7bb
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
179 changed files with 3024 additions and 793 deletions

View File

@ -1,4 +1,12 @@
# v4.0.4-alpha1
# v4.0.4-alpha2
- Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run.
- Added new import powers for custom import of spreadsheets.
- Move the setDocument and _prepareDocument above the display in the site view and custom admin view.
- Update the trashhelper layout to work in Joomla 5.
- Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
# v4.0.4-alpha
- Add [AllowDynamicProperties] in the base view class for J5
- Move the _prepareDocument above the display call in the base view class

View File

@ -3270,7 +3270,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
</a>
<h3>Upgrade to Version 4.0.4-alpha1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
<h3>Upgrade to Version 4.0.4-alpha2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
// Add/Update component in the action logs extensions table.
$this->setActionLogsExtensions();

View File

@ -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.4-alpha1) 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.4-alpha2) 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,14 +144,14 @@ 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*: 29th September, 2024
+ *Version*: 4.0.4-alpha1
+ *Last Build*: 7th October, 2024
+ *Version*: 4.0.4-alpha2
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **858763**
+ *Line count*: **865648**
+ *Field count*: **2098**
+ *File count*: **5928**
+ *Folder count*: **619**
+ *File count*: **5976**
+ *Folder count*: **621**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

View File

@ -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.4-alpha1) 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.4-alpha2) 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,14 +144,14 @@ 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*: 29th September, 2024
+ *Version*: 4.0.4-alpha1
+ *Last Build*: 7th October, 2024
+ *Version*: 4.0.4-alpha2
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **858763**
+ *Line count*: **865648**
+ *Field count*: **2098**
+ *File count*: **5928**
+ *Folder count*: **619**
+ *File count*: **5976**
+ *Folder count*: **621**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

View File

@ -78,7 +78,7 @@ function getLibraries(path) {
buildLibraries(_paths);
} else {
jQuery.get(path)
.success(function(paths) {
.done(function(paths) {
// load only this library paths
jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
buildLibraries(paths);
@ -161,7 +161,7 @@ function getSnippets(path, libraryName) {
jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
} else {
jQuery.get(path)
.success(function(paths) {
.done(function(paths) {
// load only this library paths
jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
setSnippets(paths, libraryName);
@ -190,7 +190,7 @@ function setSnippets(paths, libraryName) {
fromLocal = true;
} else {
jQuery.get(snippetPath+value.path)
.success(function(snippet) {
.done(function(snippet) {
// convert the string to json.object
snippet = jQuery.parseJSON(snippet);
jQuery.jStorage.set(value.path, snippet, {TTL: expire});
@ -469,7 +469,7 @@ function getSnippetModal(key, type) {
showSnippetModal(_snippet, type);
} else {
jQuery.get('https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/'+key)
.success(function(snippet) {
.done(function(snippet) {
// convert the string to json.object
snippet = jQuery.parseJSON(snippet);
jQuery.jStorage.set(key, snippet, {TTL: expire});
@ -527,7 +527,6 @@ function getKeyID(key) {
// return the id build
return keyID;
}
// get key ID
function getKeyID(key) {
// get useful ID

View File

@ -113,6 +113,11 @@ class ###Component###View###View### extends HtmlView
*/
protected function setDocument()
{
// Load Core
Html::_('behavior.core');
// Load jQuery
Html::_('jquery.framework');
$isNew = ($this->item->id < 1);
$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
Html::_('stylesheet', "administrator/components/com_###component###/assets/css/###view###.css", ['version' => 'auto']);###AJAXTOKE######LINKEDVIEWTABLESCRIPTS###

View File

@ -114,6 +114,11 @@ class ###Component###View###View### extends HtmlView
*/
protected function setDocument()
{
// Load Core
Html::_('behavior.core');
// Load jQuery
Html::_('jquery.framework');
$isNew = ($this->item->id < 1);
$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
// only add the ISIS template css & js if needed (default is 1 = true)

View File

@ -151,6 +151,11 @@ class ###Component###View###Views### extends HtmlView
*/
protected function setDocument()
{
// Load Core
Html::_('behavior.core');
// Load jQuery
Html::_('jquery.framework');
if (!isset($this->document))
{
$this->document = Factory::getDocument();

View File

@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -90,9 +90,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -114,9 +114,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_###component###');

View File

@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -66,9 +66,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get component params
$this->params = ComponentHelper::getParams('com_###component###');

View File

@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -34,9 +34,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get component params
$this->params = ComponentHelper::getParams('com_###component###');

View File

@ -25,14 +25,17 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
* View display method
*
* @return void
* @throws \Exception
* @since 1.6
*/
function display($tpl = null)
function display($tpl = null): void
{
// Assign data to the view
$this->icons = $this->get('Icons');

View File

@ -81,9 +81,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get combined params of both component and menu
$this->app ??= Factory::getApplication();

View File

@ -65,9 +65,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get combined params of both component and menu
$this->app ??= Factory::getApplication();

View File

@ -57,7 +57,7 @@
buttons="add,remove,move"
description="COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_DESCRIPTION"
icon="list"
max="9"
max="10"
min="1">
<form hidden="true" name="list_subform_layouts_modal" repeat="true">
<!-- View_field Field. Type: List. (joomla) -->
@ -73,6 +73,8 @@
<!-- Option Set. -->
<option value="default">
COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
<option value="admin_view.ajax_input">
COM_COMPONENTBUILDER_CONFIG_ADMIN_VIEWS_AJAX_INPUT</option>
<option value="admin_custom_tabs.tabs">
COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS</option>
<option value="admin_fields.addfields">
@ -93,6 +95,8 @@
COM_COMPONENTBUILDER_CONFIG_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS</option>
<option value="component_site_views.addsite_views">
COM_COMPONENTBUILDER_CONFIG_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS</option>
<option value="custom_admin_view.ajax_input">
COM_COMPONENTBUILDER_CONFIG_CUSTOM_ADMIN_VIEWS_AJAX_INPUT</option>
<option value="dynamic_get.join_db_table">
COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_DB_TABLE</option>
<option value="dynamic_get.join_view_table">
@ -103,6 +107,8 @@
COM_COMPONENTBUILDER_CONFIG_JOOMLA_MODULE_UPDATES_VERSION_UPDATE</option>
<option value="joomla_plugin_updates.version_update">
COM_COMPONENTBUILDER_CONFIG_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE</option>
<option value="site_view.ajax_input">
COM_COMPONENTBUILDER_CONFIG_SITE_VIEWS_AJAX_INPUT</option>
</field>
<!-- Layout Field. Type: List. (joomla) -->
<field

View File

@ -3345,6 +3345,7 @@ COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS="Admin Custom Tabs (tabs)"
COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_ADDFIELDS="Admin Fields (addfields)"
COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS="Admin Fields Conditions (addconditions)"
COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_RELATIONS_ADDRELATIONS="Admin Fields Relations (addrelations)"
COM_COMPONENTBUILDER_CONFIG_ADMIN_VIEWS_AJAX_INPUT="Admin Views (ajax_input)"
COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT="Alphanumeric+dot"
@ -3411,6 +3412,7 @@ COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION="Select your backu
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL="Cronjob Backup Server"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION="Select how you would like to backup JCB"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL="Cronjob Backup type"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_ADMIN_VIEWS_AJAX_INPUT="Custom Admin Views (ajax_input)"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION="Here you can set the path to the custom folder"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT="/home/user/custom"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
@ -3612,6 +3614,7 @@ COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_LABEL="Browser Storage"
COM_COMPONENTBUILDER_CONFIG_SHOW="Show"
COM_COMPONENTBUILDER_CONFIG_SHOW_ALL="Show All"
COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS="SimpleXMLElement Class"
COM_COMPONENTBUILDER_CONFIG_SITE_VIEWS_AJAX_INPUT="Site Views (ajax_input)"
COM_COMPONENTBUILDER_CONFIG_SMTP="SMTP"
COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_DESCRIPTION="Select yes if your SMTP host requires SMTP Authentication."
COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_LABEL="SMTP Authentication"
@ -7610,7 +7613,6 @@ COM_COMPONENTBUILDER_ONLY_ONE_COMPONENT_CAN_BE_CLONED_AT_A_TIME_PLEASE_SELECT_ON
COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION="Only (%s.zip) file was removed the from tmp folder during installation!"
COM_COMPONENTBUILDER_ONLY_USE_THE_BNONE_DBB_OPTION_IF_YOU_ARE_PLANNING_ON_TARGETING_THIS_FIELD_WITH_JAVASCRIPTCUSTOM_PHP_TO_MOVE_ITS_VALUE_INTO_ANOTHER_FIELD_THAT_DOES_GET_SAVED_TO_THE_DATABASE="Only use the <b>None DB</b> option if you are planning on targeting this field with JavaScript/Custom PHP to move its value into another field that does get saved to the database."
COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS="Open Library Snippets"
COM_COMPONENTBUILDER_OPTIONS="Options"
COM_COMPONENTBUILDER_ORDER_BEFORE="Order Before"
COM_COMPONENTBUILDER_ORDER_IN_EDIT="Order in Edit"
COM_COMPONENTBUILDER_ORDER_IN_LIST_VIEWS="Order in list views"

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@

View File

@ -20,6 +20,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
use Joomla\CMS\Version;
use VDM\Joomla\Componentbuilder\File\Factory as FileFactory;
use VDM\Joomla\Componentbuilder\Import\Factory as ImportFactory;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Uri\Uri;
@ -73,6 +74,8 @@ class CompilerController extends AdminController
/**
* Adding this so that the upload factory gets build for Super Powers
* FileFactory
* Adding this so that the import factory gets build for Super Powers
* ImportFactory
*/
/**

View File

@ -76,7 +76,7 @@ class SnippetsController extends AdminController
$input = Factory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
JArrayHelper::toInteger($pks);
ArrayHelper::toInteger($pks);
// check if there is any selections
if (!UtilitiesArrayHelper::check($pks))
{

View File

@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Component\ComponentHelper;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use Joomla\CMS\Filesystem\Folder;
// No direct access to this file
\defined('_JEXEC') or die;
@ -47,12 +48,12 @@ class CustomfilelistField extends ListField
// set the default
$options[] = Html::_('select.option', '', Text::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S',$localfolder));
// setup the folder if it does not exist
if (!\JFolder::exists($localfolder))
if (!is_dir($localfolder))
{
\JFolder::create($localfolder);
Folder::create($localfolder);
}
// now check if there are files in the folder
if ($files = \JFolder::files($localfolder))
if ($files = Folder::files($localfolder))
{
$options = array();
foreach ($files as $file)

View File

@ -830,6 +830,9 @@ class Admin_viewModel extends AdminModel
}
}
// update the ajax_input (sub form) layout
$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('admin_view', 'ajax_input'));
// update all editors to use this components global editor
$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
// now get all the editor fields

View File

@ -39,6 +39,7 @@ use VDM\Joomla\Utilities\GuidHelper;
use VDM\Joomla\Utilities\Base64Helper;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
use VDM\Joomla\Utilities\FormHelper;
use Joomla\CMS\Form\FormHelper as FormFormHelper;
// No direct access to this file
\defined('_JEXEC') or die;
@ -3441,7 +3442,7 @@ class AjaxModel extends ListModel
protected function buildFieldTextarea($name, $desc, $default, $rows)
{
// get the textarea
$textarea = \JFormHelper::loadFieldType('textarea', true);
$textarea = FormFormHelper::loadFieldType('textarea', true);
// start building the name field XML
$textareaXML = new \SimpleXMLElement('<field/>');
// textarea attributes
@ -3467,7 +3468,7 @@ class AjaxModel extends ListModel
protected function buildFieldOptionsSubform($values, $nameListOptions = null, $name = 'properties', $label = 'COM_COMPONENTBUILDER_PROPERTIESBR_SMALLHERE_YOU_CAN_SET_THE_PROPERTIES_FOR_THIS_FIELDSMALL')
{
// get the subform
$subform = \JFormHelper::loadFieldType('subform', true);
$subform = FormFormHelper::loadFieldType('subform', true);
// start building the subform field XML
$subformXML = new \SimpleXMLElement('<field/>');
// subform attributes

View File

@ -25,6 +25,10 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Componentbuilder\Compiler\Helper\Compiler;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\JsonHelper;
use Joomla\CMS\Filesystem\Folder;
use Joomla\Filesystem\File;
use Joomla\CMS\Installer\InstallerHelper;
use Joomla\CMS\Installer\Installer;
// No direct access to this file
\defined('_JEXEC') or die;
@ -302,7 +306,7 @@ class CompilerModel extends ListModel
public function emptyFolder($dir, $removeDir = false)
{
if (\JFolder::exists($dir))
if (is_dir($dir))
{
$it = new \RecursiveDirectoryIterator($dir);
$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
@ -311,19 +315,19 @@ class CompilerModel extends ListModel
if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
if ($file->isDir())
{
\JFolder::delete($file->getPathname());
Folder::delete($file->getPathname());
}
else
{
if ($file->getBasename() !== 'index.html')
{
\JFile::delete($file->getPathname());
File::delete($file->getPathname());
}
}
}
if ($removeDir)
{
if (\JFolder::delete($dir))
if (Folder::delete($dir))
{
return true;
}
@ -368,7 +372,7 @@ class CompilerModel extends ListModel
$tmp_dest = $config->get('tmp_path');
// Unpack the downloaded package file.
$package = \JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
$package = InstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
// insure the install type is folder (JCB zip file is in the folder)
$installType = 'folder';
@ -393,7 +397,7 @@ class CompilerModel extends ListModel
}
// Get an installer instance.
$installer = \JInstaller::getInstance();
$installer = Installer::getInstance();
// Install the package.
if (!$installer->install($package['dir']))
@ -430,7 +434,7 @@ class CompilerModel extends ListModel
$package['packagefile'] = $config->get('tmp_path') . '/' . $package['packagefile'];
}
\JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
InstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
// Clear the cached extension data and menu cache
$this->cleanCache('_system', 0);

View File

@ -534,6 +534,9 @@ class Custom_admin_viewModel extends AdminModel
}
}
// update the ajax_input (sub form) layout
$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('custom_admin_view', 'ajax_input'));
// update all editors to use this components global editor
$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
// now get all the editor fields

View File

@ -31,6 +31,7 @@ use VDM\Joomla\Utilities\GuidHelper;
use Joomla\CMS\Component\ComponentHelper;
use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use Joomla\Filesystem\File as FilesystemFile;
// No direct access to this file
\defined('_JEXEC') or die;
@ -205,7 +206,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
// set auto loader
ComponentbuilderHelper::autoLoader('smart');
// get install folder
$dir = JFile::stripExt($package['dir']);
$dir = FilesystemFile::stripExt($package['dir']);
// remove unziped folder
ComponentbuilderHelper::removeFolder($dir);
}
@ -311,7 +312,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
// set auto loader
ComponentbuilderHelper::autoLoader('smart');
// extract the package
if (JFile::exists($package['dir']))
if (is_file($package['dir']))
{
// does this package pass a checksum
$checksum = false;
@ -359,12 +360,12 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
// get the zip adapter
$zip = JArchive::getAdapter('zip');
// set the directory name
$this->dir = JFile::stripExt($package['dir']);
$this->dir = FilesystemFile::stripExt($package['dir']);
// unzip the package
$zip->extract($package['dir'], $this->dir);
// check for database file
$infoFile = $this->dir . '/info.vdm';
if (JFile::exists($infoFile))
if (is_file($infoFile))
{
// load the data
if ($info = FileHelper::getContent($infoFile))
@ -635,13 +636,13 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
// set auto loader
ComponentbuilderHelper::autoLoader('smart');
// extract the package
if (JFile::exists($package['dir']))
if (is_file($package['dir']))
{
// set the directory name
$this->dir = JFile::stripExt($package['dir']);
$this->dir = FilesystemFile::stripExt($package['dir']);
// check for database file
$dbFile = $this->dir . '/db.vdm';
if (!JFile::exists($dbFile))
if (!is_file($dbFile))
{
// get the zip adapter
$zip = JArchive::getAdapter('zip');
@ -649,7 +650,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
$zip->extract($package['dir'], $this->dir);
}
// check again
if (JFile::exists($dbFile))
if (is_file($dbFile))
{
// load the data
if ($data = FileHelper::getContent($dbFile))
@ -942,10 +943,10 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
$success = true;
// check if we have custom files
$customDir = str_replace('//', '/', $this->dir . '/custom');
if (JFolder::exists($customDir))
if (is_dir($customDir))
{
// great we have some custom stuff lets move it
if (!JFolder::copy($customDir, $customPath,'',true))
if (!Folder::copy($customDir, $customPath,'',true))
{
$this->app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVED_TO_CORRECT_LOCATION'), 'error');
$success = false;
@ -958,10 +959,10 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
}
// check if we have images
$imageDir = str_replace('//', '/', $this->dir . '/images');
if (JFolder::exists($imageDir))
if (is_dir($imageDir))
{
// great we have some images lets move them
if (!JFolder::copy($imageDir, $imagesPath,'',true))
if (!Folder::copy($imageDir, $imagesPath,'',true))
{
$this->app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVED_TO_CORRECT_LOCATION'), 'error');
$success = false;
@ -974,10 +975,10 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
}
// now move the dynamic files if found
$dynamicDir = str_replace('//', '/', $this->dir . '/dynamic');
if (JFolder::exists($dynamicDir))
if (is_dir($dynamicDir))
{
// get a list of folders
$folders = JFolder::folders($dynamicDir);
$folders = Folder::folders($dynamicDir);
// check if we have files
if(UtilitiesArrayHelper::check($folders))
{
@ -985,7 +986,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
{
$destination = $this->setDynamicPath($folder);
$fullPath = str_replace('//', '/', $dynamicDir . '/' . $folder);
if (!JFolder::exists($fullPath) || !JFolder::copy($fullPath, $destination,'',true))
if (!is_dir($fullPath) || !Folder::copy($fullPath, $destination,'',true))
{
$this->app->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVED_TO_BSB', $folder, $destination), 'error');
$success = false;
@ -998,7 +999,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
}
}
// get a list of files
$files = JFolder::files($dynamicDir);
$files = Folder::files($dynamicDir);
// check if we have files
if(UtilitiesArrayHelper::check($files))
{
@ -1006,7 +1007,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
{
$destination = $this->setDynamicPath($file);
$fullPath = str_replace('//', '/', $dynamicDir . '/' . $file);
if (!JFile::exists($fullPath) || !JFile::copy($fullPath, $destination))
if (!is_file($fullPath) || !FilesystemFile::copy($fullPath, $destination))
{
$this->app->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_FILE_BSB_WAS_NOT_MOVED_TO_BSB', $file, $destination), 'error');
$success = false;
@ -1041,7 +1042,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
{
$subPath = str_replace('//', '/', $this->dir . '/' . $folder);
// go to the package sub folder if found
if (JFolder::exists($subPath))
if (is_dir($subPath))
{
$this->unLockFile($subPath);
}
@ -1061,7 +1062,7 @@ class Import_joomla_componentsimportModel extends BaseDatabaseModel
// we are changing the working directory to the tmp path (important)
chdir($tmpPath);
// get a list of files in the current directory tree (all)
$files = JFolder::files('.', '.', true, true);
$files = Folder::files('.', '.', true, true);
// read in the file content
foreach ($files as $file)
{

View File

@ -32,6 +32,8 @@ use VDM\Joomla\Utilities\Base64Helper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\FOF\Encrypt\AES;
use Joomla\CMS\Filesystem\Folder;
use Joomla\Filesystem\File;
// No direct access to this file
\defined('_JEXEC') or die;
@ -254,7 +256,7 @@ class Joomla_componentsModel extends ListModel
}
// create the folders
JFolder::create($this->packagePath);
Folder::create($this->packagePath);
// update $pks with returned IDs
$pks = array();
@ -1396,10 +1398,10 @@ class Joomla_componentsModel extends ListModel
$this->lockFiles();
// remove old zip files with the same name
if (JFile::exists($this->zipPath))
if (is_file($this->zipPath))
{
// remove file if found
JFile::delete($this->zipPath);
File::delete($this->zipPath);
}
// zip the folder
@ -1421,7 +1423,7 @@ class Joomla_componentsModel extends ListModel
}
// remove the local file
JFile::delete($this->zipPath);
File::delete($this->zipPath);
}
// remove the folder
@ -1480,7 +1482,7 @@ class Joomla_componentsModel extends ListModel
chdir($tmpPath);
// get a list of files in the current directory tree (all)
$files = JFolder::files('.', '.', true, true);
$files = Folder::files('.', '.', true, true);
// read in the file content
foreach ($files as $file)
@ -1535,7 +1537,7 @@ class Joomla_componentsModel extends ListModel
if (!FileHelper::exists($tmpPath))
{
// create the folders if not found
JFolder::create($tmpPath);
Folder::create($tmpPath);
}
// now move it
@ -1559,10 +1561,10 @@ class Joomla_componentsModel extends ListModel
$customFilePath = str_replace('//', '/', $this->customPath.'/'.$item);
}
// now check if file exist
if (!JFile::exists($tmpFilePath) && JFile::exists($customFilePath))
if (!is_file($tmpFilePath) && is_file($customFilePath))
{
// move the file to its place
JFile::copy($customFilePath, $tmpFilePath);
File::copy($customFilePath, $tmpFilePath);
}
}
@ -1577,14 +1579,14 @@ class Joomla_componentsModel extends ListModel
if (!FileHelper::exists($imageFolderPath))
{
// create the folders if not found
JFolder::create($imageFolderPath);
Folder::create($imageFolderPath);
}
$tmpImagePath = str_replace('//', '/', $this->packagePath.'/'.$item);
$customImagePath = str_replace('//', '/', JPATH_ROOT.'/'.$item);
if (!JFile::exists($tmpImagePath) && JFile::exists($customImagePath))
if (!is_file($tmpImagePath) && is_file($customImagePath))
{
// move the file to its place
JFile::copy($customImagePath, $tmpImagePath);
File::copy($customImagePath, $tmpImagePath);
}
}
@ -1606,7 +1608,7 @@ class Joomla_componentsModel extends ListModel
if (!FileHelper::exists($tmpFolderPath) && FileHelper::exists($customFolderPath))
{
// move the folder to its place
JFolder::copy($customFolderPath, $tmpFolderPath,'',true);
Folder::copy($customFolderPath, $tmpFolderPath,'',true);
}
}
}

View File

@ -555,6 +555,9 @@ class Site_viewModel extends AdminModel
}
}
// update the ajax_input (sub form) layout
$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('site_view', 'ajax_input'));
// update all editors to use this components global editor
$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
// now get all the editor fields

View File

@ -26,6 +26,8 @@ use Joomla\CMS\Helper\TagsHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Filesystem\Folder;
use Joomla\Filesystem\File;
// No direct access to this file
\defined('_JEXEC') or die;
@ -161,20 +163,20 @@ class SnippetsModel extends ListModel
// get the shared paths
$this->fullPath = rtrim(ComponentbuilderHelper::getFolderPath('path', 'sharepath', Factory::getConfig()->get('tmp_path')), '/') . '/snippets';
// remove old folder with the same name
if (JFolder::exists($this->fullPath))
if (is_dir($this->fullPath))
{
// remove if old folder is found
ComponentbuilderHelper::removeFolder($this->fullPath);
}
// create the full path
JFolder::create($this->fullPath);
Folder::create($this->fullPath);
// set zip path
$this->zipPath = $this->fullPath .'.zip';
// remove old zip files with the same name
if (JFile::exists($this->zipPath))
if (is_file($this->zipPath))
{
// remove file if found
JFile::delete($this->zipPath);
File::delete($this->zipPath);
}
// prep the item
foreach($items as $item)

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -318,8 +319,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -37,7 +37,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -78,9 +78,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get component params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -27,14 +27,17 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
* View display method
*
* @return void
* @throws \Exception
* @since 1.6
*/
function display($tpl = null)
function display($tpl = null): void
{
// Assign data to the view
$this->icons = $this->get('Icons');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,9 +325,9 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
// need to add some language strings
Text::script('COM_COMPONENTBUILDER_FUNCTION_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_FUNCTION_NAME');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -324,8 +325,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -385,8 +386,8 @@ class HtmlView extends BaseHtmlView
Html::_('script', 'media/com_componentbuilder/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']);
}
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
// add return_here
$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
}
}

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use Joomla\CMS\Session\Session;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -76,9 +76,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// get component params
$this->params = ComponentHelper::getParams('com_componentbuilder');
@ -227,20 +228,20 @@ class HtmlView extends BaseHtmlView
$expire = 30000; // only 30 seconds
}
// Set the Time To Live To JavaScript
$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
// set snippet path
$this->document->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
$this->document->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
$this->getDocument()->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
$this->getDocument()->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
// token
$this->document->addScriptDeclaration("var token = '". Session::getFormToken() ."';");
$this->getDocument()->addScriptDeclaration("var token = '". Session::getFormToken() ."';");
// add some global items buckets for bulk updating
$this->document->addScriptDeclaration("var bulkItems = {};");
$this->document->addScriptDeclaration("bulkItems.new = [];");
$this->document->addScriptDeclaration("bulkItems.diverged = [];");
$this->document->addScriptDeclaration("bulkItems.ahead = [];");
$this->document->addScriptDeclaration("bulkItems.behind = [];");
$this->getDocument()->addScriptDeclaration("var bulkItems = {};");
$this->getDocument()->addScriptDeclaration("bulkItems.new = [];");
$this->getDocument()->addScriptDeclaration("bulkItems.diverged = [];");
$this->getDocument()->addScriptDeclaration("bulkItems.ahead = [];");
$this->getDocument()->addScriptDeclaration("bulkItems.behind = [];");
// set an error message if needed
$this->document->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".Text::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".Text::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
$this->getDocument()->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".Text::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".Text::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
// need to add some language strings
Text::script('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS');
Text::script('COM_COMPONENTBUILDER_SNIPPETS');
@ -275,7 +276,7 @@ class HtmlView extends BaseHtmlView
Text::script('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES');
Text::script('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS');
// add some lang verfy messages
$this->document->addScriptDeclaration("
$this->getDocument()->addScriptDeclaration("
// set the snippet from gitHub
function getConfirmUpdate(status) {
switch(status) {
@ -301,7 +302,7 @@ class HtmlView extends BaseHtmlView
if (ArrayHelper::check($this->items))
{
// Set the local snippets array
$this->document->addScriptDeclaration("var local_snippets = ". json_encode($local_snippets).";");
$this->getDocument()->addScriptDeclaration("var local_snippets = ". json_encode($local_snippets).";");
}
// add styles
foreach ($this->styles as $style)

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -167,10 +167,10 @@ class HtmlView extends BaseHtmlView
}
// Set the Time To Live To JavaScript
$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
$this->document->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';");
$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
$this->getDocument()->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';");
// add a token on the page for javascript
$this->document->addScriptDeclaration("var token = '".Session::getFormToken()."';");
$this->getDocument()->addScriptDeclaration("var token = '".Session::getFormToken()."';");
// add the Uikit v2 style sheets

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\ArrayHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -125,9 +125,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -35,7 +35,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -124,9 +124,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// set params
$this->params = ComponentHelper::getParams('com_componentbuilder');

View File

@ -36,7 +36,7 @@ use VDM\Joomla\Utilities\StringHelper;
*
* @since 1.6
*/
#[AllowDynamicProperties]
#[\AllowDynamicProperties]
class HtmlView extends BaseHtmlView
{
/**
@ -101,9 +101,10 @@ class HtmlView extends BaseHtmlView
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
* @return void
* @throws \Exception
* @since 1.6
*/
public function display($tpl = null)
public function display($tpl = null): void
{
// Assign data to the view
$this->items = $this->get('Items');

Some files were not shown because too many files have changed in this diff Show More