joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

Stable release of v3.2.0-beta1

Browse Source 
Move beta to main repo. Fix #1053 so that the right and left tabs display correctly in Joomla 4&5.
This commit is contained in:
Robot
2024-03-02 22:10:30 +02:00
parent 3c91a5cdbb
commit d1e1a56671
1786 changed files with 73608 additions and 37437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
admin/views/custom_codes/view.html.php
View File

@@ -12,7 +12,20 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Form\FormHelper;
use Joomla\CMS\Session\Session;
use Joomla\CMS\Uri\Uri;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Layout\FileLayout;
use Joomla\CMS\MVC\View\HtmlView;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Toolbar\ToolbarHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
/**
* Componentbuilder Html View class for the Custom_codes
@@ -35,7 +48,7 @@ class ComponentbuilderViewCustom_codes extends HtmlView
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
$this->state = $this->get('State');
$this->user = JFactory::getUser();
$this->user = Factory::getUser();
// Load the filter form from xml.
$this->filterForm = $this->get('FilterForm');
// Load the active filters.
@@ -45,7 +58,7 @@ class ComponentbuilderViewCustom_codes extends HtmlView
$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
$this->saveOrder = $this->listOrder == 'a.ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));
// get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('custom_code');
$this->canEdit = $this->canDo->get('custom_code.edit');
@@ -65,7 +78,7 @@ class ComponentbuilderViewCustom_codes extends HtmlView
$this->batchDisplay = JHtmlBatch_::render();
}
}
// Check for errors.
if (count($errors = $this->get('Errors')))
{
@@ -84,32 +97,32 @@ class ComponentbuilderViewCustom_codes extends HtmlView
*/
protected function addToolBar()
{
JToolBarHelper::title(JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES'), 'shuffle');
JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=custom_codes');
JFormHelper::addFieldPath(JPATH_COMPONENT . '/models/fields');
ToolbarHelper::title(Text::_('COM_COMPONENTBUILDER_CUSTOM_CODES'), 'shuffle');
FormHelper::addFieldPath(JPATH_COMPONENT . '/models/fields');
if ($this->canCreate)
{
JToolBarHelper::addNew('custom_code.add');
ToolbarHelper::addNew('custom_code.add');
}
// Only load if there are items
if (ComponentbuilderHelper::checkArray($this->items))
if (ArrayHelper::check($this->items))
{
if ($this->canEdit)
{
JToolBarHelper::editList('custom_code.edit');
ToolbarHelper::editList('custom_code.edit');
}
if ($this->canState)
{
JToolBarHelper::publishList('custom_codes.publish');
JToolBarHelper::unpublishList('custom_codes.unpublish');
JToolBarHelper::archiveList('custom_codes.archive');
ToolbarHelper::publishList('custom_codes.publish');
ToolbarHelper::unpublishList('custom_codes.unpublish');
ToolbarHelper::archiveList('custom_codes.archive');
if ($this->canDo->get('core.admin'))
{
JToolBarHelper::checkin('custom_codes.checkin');
ToolbarHelper::checkin('custom_codes.checkin');
}
}
@@ -117,11 +130,11 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit && $this->canState)
{
// Get the toolbar object instance
$bar = JToolBar::getInstance('toolbar');
$bar = Toolbar::getInstance('toolbar');
// set the batch button name
$title = JText::_('JTOOLBAR_BATCH');
$title = Text::_('JTOOLBAR_BATCH');
// Instantiate a new JLayoutFile instance and render the batch button
$layout = new JLayoutFile('joomla.toolbar.batch');
$layout = new FileLayout('joomla.toolbar.batch');
// add the button to the page
$dhtml = $layout->render(array('title' => $title));
$bar->appendButton('Custom', $dhtml, 'batch');
@@ -129,49 +142,49 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete))
{
JToolbarHelper::deleteList('', 'custom_codes.delete', 'JTOOLBAR_EMPTY_TRASH');
ToolbarHelper::deleteList('', 'custom_codes.delete', 'JTOOLBAR_EMPTY_TRASH');
}
elseif ($this->canState && $this->canDelete)
{
JToolbarHelper::trash('custom_codes.trash');
ToolbarHelper::trash('custom_codes.trash');
}
if ($this->canDo->get('core.export') && $this->canDo->get('custom_code.export'))
{
JToolBarHelper::custom('custom_codes.exportData', 'download', '', 'COM_COMPONENTBUILDER_EXPORT_DATA', true);
ToolbarHelper::custom('custom_codes.exportData', 'download', '', 'COM_COMPONENTBUILDER_EXPORT_DATA', true);
}
}
if ($this->user->authorise('custom_code.run_expansion', 'com_componentbuilder'))
{
// add Run Expansion button.
JToolBarHelper::custom('custom_codes.runExpansion', 'expand-2 custom-button-runexpansion', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
ToolbarHelper::custom('custom_codes.runExpansion', 'expand-2 custom-button-runexpansion', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
}
if ($this->canDo->get('core.import') && $this->canDo->get('custom_code.import'))
{
JToolBarHelper::custom('custom_codes.importData', 'upload', '', 'COM_COMPONENTBUILDER_IMPORT_DATA', false);
ToolbarHelper::custom('custom_codes.importData', 'upload', '', 'COM_COMPONENTBUILDER_IMPORT_DATA', false);
}
// set help url for this view if found
$this->help_url = ComponentbuilderHelper::getHelpUrl('custom_codes');
if (ComponentbuilderHelper::checkString($this->help_url))
if (StringHelper::check($this->help_url))
{
JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
ToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
}
// add the options comp button
if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
{
JToolBarHelper::preferences('com_componentbuilder');
ToolbarHelper::preferences('com_componentbuilder');
}
// Only load published batch if state and batch is allowed
if ($this->canState && $this->canBatch)
{
JHtmlBatch_::addListSelection(
JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE'),
Text::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE'),
'batch[published]',
JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('all' => false)), 'value', 'text', '', true)
Html::_('select.options', Html::_('jgrid.publishedOptions', array('all' => false)), 'value', 'text', '', true)
);
}
@@ -179,9 +192,9 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
JHtmlBatch_::addListSelection(
JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS'),
Text::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS'),
'batch[access]',
JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')
Html::_('select.options', Html::_('access.assetgroups'), 'value', 'text')
);
}
@@ -189,19 +202,19 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
// Set Component System Name Selection
$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Joomlacomponent')->options;
$this->componentSystem_nameOptions = FormHelper::loadFieldType('Joomlacomponent')->options;
// We do some sanitation for Component System Name filter
if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) &&
if (ArrayHelper::check($this->componentSystem_nameOptions) &&
isset($this->componentSystem_nameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
!StringHelper::check($this->componentSystem_nameOptions[0]->value))
{
unset($this->componentSystem_nameOptions[0]);
}
// Component System Name Batch Selection
JHtmlBatch_::addListSelection(
'- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -',
'- Keep Original '.Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -',
'batch[component]',
JHtml::_('select.options', $this->componentSystem_nameOptions, 'value', 'text')
Html::_('select.options', $this->componentSystem_nameOptions, 'value', 'text')
);
}
@@ -209,19 +222,19 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
// Set Target Selection
$this->targetOptions = JFormHelper::loadFieldType('customcodesfiltertarget')->options;
$this->targetOptions = FormHelper::loadFieldType('customcodesfiltertarget')->options;
// We do some sanitation for Target filter
if (ComponentbuilderHelper::checkArray($this->targetOptions) &&
if (ArrayHelper::check($this->targetOptions) &&
isset($this->targetOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
!StringHelper::check($this->targetOptions[0]->value))
{
unset($this->targetOptions[0]);
}
// Target Batch Selection
JHtmlBatch_::addListSelection(
'- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -',
'- Keep Original '.Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -',
'batch[target]',
JHtml::_('select.options', $this->targetOptions, 'value', 'text')
Html::_('select.options', $this->targetOptions, 'value', 'text')
);
}
@@ -229,19 +242,19 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
// Set Type Selection
$this->typeOptions = JFormHelper::loadFieldType('customcodesfiltertype')->options;
$this->typeOptions = FormHelper::loadFieldType('customcodesfiltertype')->options;
// We do some sanitation for Type filter
if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
if (ArrayHelper::check($this->typeOptions) &&
isset($this->typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
!StringHelper::check($this->typeOptions[0]->value))
{
unset($this->typeOptions[0]);
}
// Type Batch Selection
JHtmlBatch_::addListSelection(
'- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -',
'- Keep Original '.Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -',
'batch[type]',
JHtml::_('select.options', $this->typeOptions, 'value', 'text')
Html::_('select.options', $this->typeOptions, 'value', 'text')
);
}
@@ -249,19 +262,19 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
// Set Comment Type Selection
$this->comment_typeOptions = JFormHelper::loadFieldType('customcodesfiltercommenttype')->options;
$this->comment_typeOptions = FormHelper::loadFieldType('customcodesfiltercommenttype')->options;
// We do some sanitation for Comment Type filter
if (ComponentbuilderHelper::checkArray($this->comment_typeOptions) &&
if (ArrayHelper::check($this->comment_typeOptions) &&
isset($this->comment_typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value))
!StringHelper::check($this->comment_typeOptions[0]->value))
{
unset($this->comment_typeOptions[0]);
}
// Comment Type Batch Selection
JHtmlBatch_::addListSelection(
'- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
'- Keep Original '.Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
'batch[comment_type]',
JHtml::_('select.options', $this->comment_typeOptions, 'value', 'text')
Html::_('select.options', $this->comment_typeOptions, 'value', 'text')
);
}
}
@@ -275,10 +288,10 @@ class ComponentbuilderViewCustom_codes extends HtmlView
{
if (!isset($this->document))
{
$this->document = JFactory::getDocument();
$this->document = Factory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES'));
$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_codes.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
$this->document->setTitle(Text::_('COM_COMPONENTBUILDER_CUSTOM_CODES'));
Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/custom_codes.css", ['version' => 'auto']);
}
/**
@@ -293,28 +306,39 @@ class ComponentbuilderViewCustom_codes extends HtmlView
if(strlen($var) > 50)
{
// use the helper htmlEscape method instead and shorten the string
return ComponentbuilderHelper::htmlEscape($var, $this->_charset, true);
return StringHelper::html($var, $this->_charset, true);
}
// use the helper htmlEscape method instead.
return ComponentbuilderHelper::htmlEscape($var, $this->_charset);
return StringHelper::html($var, $this->_charset);
}
/**
* Returns an array of fields the table can be sorted by
*
* @return array Array containing the field name to sort by as the key and display text as value
* @return array Array containing the field name to sort by as the key and display text as value
*/
protected function getSortFields()
{
return array(
'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
'a.published' => JText::_('JSTATUS'),
'g.system_name' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL'),
'a.path' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL'),
'a.target' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL'),
'a.type' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL'),
'a.comment_type' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL'),
'a.id' => JText::_('JGRID_HEADING_ID')
'a.ordering' => Text::_('JGRID_HEADING_ORDERING'),
'a.published' => Text::_('JSTATUS'),
'g.system_name' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL'),
'a.path' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL'),
'a.target' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL'),
'a.type' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL'),
'a.comment_type' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL'),
'a.joomla_version' => Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_JOOMLA_VERSION_LABEL'),
'a.id' => Text::_('JGRID_HEADING_ID')
);
}
/**
* Get the Document (helper method toward Joomla 4 and 5)
*/
public function getDocument()
{
$this->document ??= JFactory::getDocument();
return $this->document;
}
}