joomla/Component-Builder
39
25
Fork 11
Code Issues 76 Pull Requests 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

110
admin/tables/component_plugins.php
View File

@ -12,10 +12,17 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Access\Access as AccessRules;
use Joomla\CMS\Access\Rules;
use Joomla\Registry\Registry;
use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\String\PunycodeHelper;
use Joomla\CMS\Table\Observer\Tags as TableObserverTags;
use Joomla\CMS\Table\Observer\ContentHistory as TableObserverContenthistory;
use Joomla\CMS\Application\ApplicationHelper;
/**
* Components_plugins Table class
@ -29,63 +36,63 @@ class ComponentbuilderTableComponent_plugins extends Table
* @since 3.3
*/
protected $_jsonEncode = array('params', 'metadata');
/**
* Constructor
*
* @param object Database connector object
*/
function __construct(&$db)
function __construct(&$db)
{
parent::__construct('#__componentbuilder_component_plugins', 'id', $db);
// Adding History Options
JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.component_plugins'));
}
TableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.component_plugins'));
}
public function bind($array, $ignore = '')
{
if (isset($array['params']) && is_array($array['params']))
{
$registry = new JRegistry;
$registry = new Registry;
$registry->loadArray($array['params']);
$array['params'] = (string) $registry;
}
if (isset($array['metadata']) && is_array($array['metadata']))
{
$registry = new JRegistry;
$registry = new Registry;
$registry->loadArray($array['metadata']);
$array['metadata'] = (string) $registry;
}
// Bind the rules.
// Bind the rules.
if (isset($array['rules']) && is_array($array['rules']))
{
$rules = new JAccessRules($array['rules']);
$this->setRules($rules);
{
$rules = new AccessRules($array['rules']);
$this->setRules($rules);
}
return parent::bind($array, $ignore);
}
/**
* Overload the store method for the Component_plugins table.
*
* @param boolean Toggle whether null values should be updated.
* @param boolean Toggle whether null values should be updated.
* @return boolean True on success, false on failure.
* @since 1.6
*/
public function store($updateNulls = false)
{
$date = JFactory::getDate();
$user = JFactory::getUser();
$date = Factory::getDate();
$user = Factory::getUser();
if ($this->id)
{
// Existing item
$this->modified = $date->toSql();
$this->modified_by = $user->get('id');
$this->modified = $date->toSql();
$this->modified_by = $user->get('id');
}
else
{
@ -100,33 +107,38 @@ class ComponentbuilderTableComponent_plugins extends Table
$this->created_by = $user->get('id');
}
}
if (isset($this->alias))
{
// Verify that the alias is unique
$table = JTable::getInstance('component_plugins', 'ComponentbuilderTable');
$table = Table::getInstance('component_plugins', 'ComponentbuilderTable');
if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
{
$this->setError(JText::_('COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ERROR_UNIQUE_ALIAS'));
$this->setError(Text::_('COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ERROR_UNIQUE_ALIAS'));
if ($table->published === -2)
{
$this->setError(Text::_('COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ERROR_UNIQUE_ALIAS_TRASHED'));
}
return false;
}
}
if (isset($this->url))
{
// Convert IDN urls to punycode
$this->url = JStringPunycode::urlToPunycode($this->url);
$this->url = PunycodeHelper::urlToPunycode($this->url);
}
if (isset($this->website))
{
// Convert IDN urls to punycode
$this->website = JStringPunycode::urlToPunycode($this->website);
$this->website = PunycodeHelper::urlToPunycode($this->website);
}
return parent::store($updateNulls);
}
/**
* Overloaded check method to ensure data integrity.
*
@ -138,20 +150,20 @@ class ComponentbuilderTableComponent_plugins extends Table
{
// Generate a valid alias
$this->generateAlias();
$table = JTable::getInstance('component_plugins', 'componentbuilderTable');
$table = Table::getInstance('component_plugins', 'componentbuilderTable');
while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
{
$this->alias = StringHelper::increment($this->alias, 'dash');
}
}
/*
* Clean up keywords -- eliminate extra spaces between phrases
* and cr (\r) and lf (\n) characters from string.
* Only process if not empty.
*/
*/
if (!empty($this->metakey))
{
// Array of characters to remove.
@ -162,7 +174,7 @@ class ComponentbuilderTableComponent_plugins extends Table
// Create array using commas as delimiter.
$keys = explode(',', $after_clean);
$clean_keys = array();
$clean_keys = [];
foreach ($keys as $key)
{
@ -185,13 +197,13 @@ class ComponentbuilderTableComponent_plugins extends Table
$this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc);
}
// If we don't have any access rules set at this point just use an empty JAccessRules class
// If we don't have any access rules set at this point just use an empty AccessRules class
if (!$this->getRules())
{
$rules = $this->getDefaultAssetValues('com_componentbuilder.component_plugins.'.$this->id);
$this->setRules($rules);
}
// Set ordering
if ($this->published < 0)
{
@ -207,12 +219,12 @@ class ComponentbuilderTableComponent_plugins extends Table
*
* @param $string $component The component asset name to search for
*
* @return JAccessRules The JAccessRules object for the asset
* @return AccessRules The AccessRules object for the asset
*/
protected function getDefaultAssetValues($component, $try = true)
{
// Need to find the asset id by the name of the component.
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select($db->quoteName('id'))
->from($db->quoteName('#__assets'))
@ -223,14 +235,14 @@ class ComponentbuilderTableComponent_plugins extends Table
{
// asset already set so use saved rules
$assetId = (int) $db->loadResult();
return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
return AccessRules::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
}
// try again
elseif ($try)
{
$try = explode('.',$component);
$result = $this->getDefaultAssetValues($try[0], false);
if ($result instanceof JAccessRules)
if ($result instanceof AccessRules)
{
if (isset($try[1]))
{
@ -247,7 +259,7 @@ class ComponentbuilderTableComponent_plugins extends Table
else
{
// clear the value since we inherit
$rule = array();
$rule = [];
}
}
// check if there are any view values remaining
@ -255,8 +267,8 @@ class ComponentbuilderTableComponent_plugins extends Table
{
$_result = json_encode($_result);
$_result = array($_result);
// Instantiate and return the JAccessRules object for the asset rules.
$rules = new JAccessRules;
// Instantiate and return the AccessRules object for the asset rules.
$rules = new AccessRules;
$rules->mergeCollection($_result);
return $rules;
@ -265,7 +277,7 @@ class ComponentbuilderTableComponent_plugins extends Table
return $result;
}
}
return JAccess::getAssetRules(0);
return AccessRules::getAssetRules(0);
}
/**
@ -273,8 +285,8 @@ class ComponentbuilderTableComponent_plugins extends Table
* The default name is in the form 'table_name.id'
* where id is the value of the primary key of the table.
*
* @return string
* @since 2.5
* @return string
* @since 2.5
*/
protected function _getAssetName()
{
@ -285,8 +297,8 @@ class ComponentbuilderTableComponent_plugins extends Table
/**
* Method to return the title to use for the asset table.
*
* @return string
* @since 2.5
* @return string
* @since 2.5
*/
protected function _getAssetTitle()
{
@ -300,12 +312,12 @@ class ComponentbuilderTableComponent_plugins extends Table
/**
* Get the parent asset id for the record
*
* @return int
* @since 2.5
* @return int
* @since 2.5
*/
protected function _getAssetParentId(JTable $table = NULL, $id = NULL)
protected function _getAssetParentId(?Table $table = null, $id = null)
{
$asset = JTable::getInstance('Asset');
$asset = Table::getInstance('Asset');
$asset->loadByName('com_componentbuilder');
return $asset->id;