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

194
admin/models/fieldtype.php
View File

@ -12,14 +12,22 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Filter\InputFilter;
use Joomla\CMS\Filter\OutputFilter;
use Joomla\CMS\MVC\Model\AdminModel;
use Joomla\CMS\Table\Table;
use Joomla\CMS\UCM\UCMType;
use Joomla\Registry\Registry;
use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Helper\TagsHelper;
use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\GuidHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\GetHelper;
/**
@ -91,16 +99,16 @@ class ComponentbuilderModelFieldtype extends AdminModel
* @param string $prefix A prefix for the table class name. Optional.
* @param array $config Configuration array for model. Optional.
*
* @return JTable A database object
* @return Table A database object
*
* @since 1.6
*/
public function getTable($type = 'fieldtype', $prefix = 'ComponentbuilderTable', $config = array())
public function getTable($type = 'fieldtype', $prefix = 'ComponentbuilderTable', $config = [])
{
// add table path for when model gets used from other component
$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
// get instance of the table
return JTable::getInstance($type, $prefix, $config);
return Table::getInstance($type, $prefix, $config);
}
@ -136,13 +144,12 @@ class ComponentbuilderModelFieldtype extends AdminModel
ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
// set a return value if found
$jinput = JFactory::getApplication()->input;
$jinput = Factory::getApplication()->input;
$return = $jinput->get('return', null, 'base64');
ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
// set a GUID value if found
if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
&& method_exists('ComponentbuilderHelper', 'validGUID')
&& ComponentbuilderHelper::validGUID($item->guid))
&& GuidHelper::valid($item->guid))
{
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
}
@ -151,7 +158,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
return $this->vastDevMod;
}
/**
* Method to get a single record.
*
@ -210,13 +217,12 @@ class ComponentbuilderModelFieldtype extends AdminModel
ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
// set a return value if found
$jinput = JFactory::getApplication()->input;
$jinput = Factory::getApplication()->input;
$return = $jinput->get('return', null, 'base64');
ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
// set a GUID value if found
if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
&& method_exists('ComponentbuilderHelper', 'validGUID')
&& ComponentbuilderHelper::validGUID($item->guid))
&& GuidHelper::valid($item->guid))
{
ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
}
@ -235,7 +241,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
}
$item->properties = $bucket;
// be sure to update the value in the db
$objectUpdate = new stdClass();
$objectUpdate = new \stdClass();
$objectUpdate->id = (int) $item->id;
$objectUpdate->properties = json_encode($bucket);
$this->db->updateObject('#__componentbuilder_fieldtype', $objectUpdate, 'id');
@ -254,9 +260,9 @@ class ComponentbuilderModelFieldtype extends AdminModel
public function getVycfields()
{
// Get the user object.
$user = JFactory::getUser();
$user = Factory::getUser();
// Create a new query object.
$db = JFactory::getDBO();
$db = Factory::getDBO();
$query = $db->getQuery(true);
// Select some fields
@ -341,7 +347,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
$query->where('a.access = ' . (int) $_access);
}
elseif (ComponentbuilderHelper::checkArray($_access))
elseif (UtilitiesArrayHelper::check($_access))
{
// Secure the array for the query
$_access = ArrayHelper::toInteger($_access);
@ -367,12 +373,12 @@ class ComponentbuilderModelFieldtype extends AdminModel
$items = $db->loadObjectList();
// Set values to display correctly.
if (ComponentbuilderHelper::checkArray($items))
if (UtilitiesArrayHelper::check($items))
{
// Get the user object if not set.
if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
if (!isset($user) || !ObjectHelper::check($user))
{
$user = JFactory::getUser();
$user = Factory::getUser();
}
foreach ($items as $nr => &$item)
{
@ -388,7 +394,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
}
// set selection value to a translatable value
if (ComponentbuilderHelper::checkArray($items))
if (UtilitiesArrayHelper::check($items))
{
foreach ($items as $nr => &$item)
{
@ -411,7 +417,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
/**
* Method to convert selection values to translatable string.
*
* @return translatable string
* @return string The translatable string.
*/
public function selectionTranslationVycfields($value,$name)
{
@ -440,7 +446,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
'DOUBLE' => 'COM_COMPONENTBUILDER_FIELD_DOUBLE'
);
// Now check if value is found in this array
if (isset($datatypeArray[$value]) && ComponentbuilderHelper::checkString($datatypeArray[$value]))
if (isset($datatypeArray[$value]) && UtilitiesStringHelper::check($datatypeArray[$value]))
{
return $datatypeArray[$value];
}
@ -454,7 +460,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
0 => 'COM_COMPONENTBUILDER_FIELD_NONE'
);
// Now check if value is found in this array
if (isset($indexesArray[$value]) && ComponentbuilderHelper::checkString($indexesArray[$value]))
if (isset($indexesArray[$value]) && UtilitiesStringHelper::check($indexesArray[$value]))
{
return $indexesArray[$value];
}
@ -467,7 +473,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
'NOT NULL' => 'COM_COMPONENTBUILDER_FIELD_NOT_NULL'
);
// Now check if value is found in this array
if (isset($null_switchArray[$value]) && ComponentbuilderHelper::checkString($null_switchArray[$value]))
if (isset($null_switchArray[$value]) && UtilitiesStringHelper::check($null_switchArray[$value]))
{
return $null_switchArray[$value];
}
@ -485,7 +491,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
);
// Now check if value is found in this array
if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
if (isset($storeArray[$value]) && UtilitiesStringHelper::check($storeArray[$value]))
{
return $storeArray[$value];
}
@ -504,7 +510,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
*
* @since 1.6
*/
public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
public function getForm($data = [], $loadData = true, $options = array('control' => 'jform'))
{
// set load data option
$options['load_data'] = $loadData;
@ -531,7 +537,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
return false;
}
$jinput = JFactory::getApplication()->input;
$jinput = Factory::getApplication()->input;
// The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
if ($jinput->get('a_id'))
@ -544,7 +550,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
$id = $jinput->get('id', 0, 'INT');
}
$user = JFactory::getUser();
$user = Factory::getUser();
// Check for existing item.
// Modify the form based on Edit State access controls.
@ -615,13 +621,13 @@ class ComponentbuilderModelFieldtype extends AdminModel
/**
* Method to get the script that have to be included on the form
*
* @return string script files
* @return string script files
*/
public function getScript()
{
return 'media/com_componentbuilder/js/fieldtype.js';
}
/**
* Method to test whether a record can be deleted.
*
@ -640,7 +646,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
return;
}
$user = JFactory::getUser();
$user = Factory::getUser();
// The record has been set. Check the record permissions.
return $user->authorise('fieldtype.delete', 'com_componentbuilder.fieldtype.' . (int) $record->id);
}
@ -658,8 +664,8 @@ class ComponentbuilderModelFieldtype extends AdminModel
*/
protected function canEditState($record)
{
$user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0;
$user = Factory::getUser();
$recordId = $record->id ?? 0;
if ($recordId)
{
@ -673,28 +679,28 @@ class ComponentbuilderModelFieldtype extends AdminModel
// In the absence of better information, revert to the component permissions.
return $user->authorise('fieldtype.edit.state', 'com_componentbuilder');
}
/**
* Method override to check if you can edit an existing record.
*
* @param array $data An array of input data.
* @param string $key The name of the key for the primary key.
* @param array $data An array of input data.
* @param string $key The name of the key for the primary key.
*
* @return boolean
* @since 2.5
* @return boolean
* @since 2.5
*/
protected function allowEdit($data = array(), $key = 'id')
protected function allowEdit($data = [], $key = 'id')
{
// Check specific edit permission then general edit permission.
$user = JFactory::getUser();
$user = Factory::getUser();
return $user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('fieldtype.edit', 'com_componentbuilder');
}
/**
* Prepare and sanitise the table data prior to saving.
*
* @param JTable $table A JTable object.
* @param Table $table A Table object.
*
* @return void
*
@ -702,19 +708,19 @@ class ComponentbuilderModelFieldtype extends AdminModel
*/
protected function prepareTable($table)
{
$date = JFactory::getDate();
$user = JFactory::getUser();
$date = Factory::getDate();
$user = Factory::getUser();
if (isset($table->name))
{
$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
}
if (isset($table->alias) && empty($table->alias))
{
$table->generateAlias();
}
if (empty($table->id))
{
$table->created = $date->toSql();
@ -726,7 +732,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
// Set ordering to the last item if not set
if (empty($table->ordering))
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select('MAX(ordering)')
->from($db->quoteName('#__componentbuilder_fieldtype'));
@ -741,7 +747,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
$table->modified = $date->toSql();
$table->modified_by = $user->id;
}
if (!empty($table->id))
{
// Increment the items version number.
@ -756,10 +762,10 @@ class ComponentbuilderModelFieldtype extends AdminModel
*
* @since 1.6
*/
protected function loadFormData()
protected function loadFormData()
{
// Check the session for previously entered form data.
$data = JFactory::getApplication()->getUserState('com_componentbuilder.edit.fieldtype.data', array());
$data = Factory::getApplication()->getUserState('com_componentbuilder.edit.fieldtype.data', []);
if (empty($data))
{
@ -787,7 +793,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
public function validate($form, $data, $group = null)
{
// check if the not_required field is set
if (isset($data['not_required']) && ComponentbuilderHelper::checkString($data['not_required']))
if (isset($data['not_required']) && UtilitiesStringHelper::check($data['not_required']))
{
$requiredFields = (array) explode(',',(string) $data['not_required']);
$requiredFields = array_unique($requiredFields);
@ -795,7 +801,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
foreach ($requiredFields as $requiredField)
{
// make sure there is a string value
if (ComponentbuilderHelper::checkString($requiredField))
if (UtilitiesStringHelper::check($requiredField))
{
// change to false
$form->setFieldAttribute($requiredField, 'required', 'false');
@ -818,7 +824,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
return array('guid');
}
/**
* Method to delete one or more records.
*
@ -834,7 +840,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
return false;
}
return true;
}
@ -854,10 +860,10 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
return false;
}
return true;
}
}
/**
* Method to perform batch operations on an item or a set of items.
*
@ -883,30 +889,30 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (empty($pks))
{
$this->setError(JText::_('JGLOBAL_NO_ITEM_SELECTED'));
$this->setError(Text::_('JGLOBAL_NO_ITEM_SELECTED'));
return false;
}
$done = false;
// Set some needed variables.
$this->user = JFactory::getUser();
$this->table = $this->getTable();
$this->tableClassName = get_class($this->table);
$this->contentType = new JUcmType;
$this->type = $this->contentType->getTypeByTable($this->tableClassName);
$this->canDo = ComponentbuilderHelper::getActions('fieldtype');
$this->batchSet = true;
$this->user = Factory::getUser();
$this->table = $this->getTable();
$this->tableClassName = get_class($this->table);
$this->contentType = new UCMType;
$this->type = $this->contentType->getTypeByTable($this->tableClassName);
$this->canDo = ComponentbuilderHelper::getActions('fieldtype');
$this->batchSet = true;
if (!$this->canDo->get('core.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
return false;
}
if ($this->type == false)
{
$type = new JUcmType;
$type = new UCMType;
$this->type = $type->getTypeByAlias($this->typeAlias);
}
@ -943,8 +949,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (!$done)
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
return false;
}
@ -970,7 +975,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (empty($this->batchSet))
{
// Set some needed variables.
$this->user = JFactory::getUser();
$this->user = Factory::getUser();
$this->table = $this->getTable();
$this->tableClassName = get_class($this->table);
$this->canDo = ComponentbuilderHelper::getActions('fieldtype');
@ -1011,7 +1016,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
unset($values['category']);
}
$newIds = array();
$newIds = [];
// Parent exists so let's proceed
while (!empty($pks))
{
@ -1024,7 +1029,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (!$this->user->authorise('fieldtype.edit', $contexts[$pk]))
{
// Not fatal error
$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
continue;
}
@ -1040,13 +1045,13 @@ class ComponentbuilderModelFieldtype extends AdminModel
else
{
// Not fatal error
$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
continue;
}
}
// insert all set values
if (ComponentbuilderHelper::checkArray($values))
if (UtilitiesArrayHelper::check($values))
{
foreach ($values as $key => $value)
{
@ -1058,7 +1063,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
}
// update all unique fields
if (ComponentbuilderHelper::checkArray($uniqueFields))
if (UtilitiesArrayHelper::check($uniqueFields))
{
foreach ($uniqueFields as $uniqueField)
{
@ -1122,7 +1127,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (empty($this->batchSet))
{
// Set some needed variables.
$this->user = JFactory::getUser();
$this->user = Factory::getUser();
$this->table = $this->getTable();
$this->tableClassName = get_class($this->table);
$this->canDo = ComponentbuilderHelper::getActions('fieldtype');
@ -1130,7 +1135,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
if (!$this->canDo->get('fieldtype.edit') && !$this->canDo->get('fieldtype.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
@ -1163,7 +1168,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
if (!$this->user->authorise('fieldtype.edit', $contexts[$pk]))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
@ -1179,13 +1184,13 @@ class ComponentbuilderModelFieldtype extends AdminModel
else
{
// Not fatal error
$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
continue;
}
}
// insert all set values.
if (ComponentbuilderHelper::checkArray($values))
if (UtilitiesArrayHelper::check($values))
{
foreach ($values as $key => $value)
{
@ -1229,7 +1234,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
return true;
}
/**
* Method to save the form data.
*
@ -1241,15 +1246,15 @@ class ComponentbuilderModelFieldtype extends AdminModel
*/
public function save($data)
{
$input = JFactory::getApplication()->input;
$filter = JFilterInput::getInstance();
$input = Factory::getApplication()->input;
$filter = InputFilter::getInstance();
// set the metadata to the Item Data
if (isset($data['metadata']) && isset($data['metadata']['author']))
{
$data['metadata']['author'] = $filter->clean($data['metadata']['author'], 'TRIM');
$metadata = new JRegistry;
$metadata = new Registry;
$metadata->loadArray($data['metadata']);
$data['metadata'] = (string) $metadata;
}
@ -1272,7 +1277,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
// Set the properties items to data.
if (isset($data['properties']) && is_array($data['properties']))
{
$properties = new JRegistry;
$properties = new Registry;
$properties->loadArray($data['properties']);
$data['properties'] = (string) $properties;
}
@ -1281,11 +1286,11 @@ class ComponentbuilderModelFieldtype extends AdminModel
// Set the empty properties to data
$data['properties'] = '';
}
// Set the Params Items to data
if (isset($data['params']) && is_array($data['params']))
{
$params = new JRegistry;
$params = new Registry;
$params->loadArray($data['params']);
$data['params'] = (string) $params;
}
@ -1295,7 +1300,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
{
// Automatic handling of other unique fields
$uniqueFields = $this->getUniqueFields();
if (ComponentbuilderHelper::checkArray($uniqueFields))
if (UtilitiesArrayHelper::check($uniqueFields))
{
foreach ($uniqueFields as $uniqueField)
{
@ -1303,14 +1308,14 @@ class ComponentbuilderModelFieldtype extends AdminModel
}
}
}
if (parent::save($data))
{
return true;
}
return false;
}
/**
* Method to generate a unique value.
*
@ -1323,7 +1328,6 @@ class ComponentbuilderModelFieldtype extends AdminModel
*/
protected function generateUnique($field,$value)
{
// set field value unique
$table = $this->getTable();
@ -1349,7 +1353,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
// Alter the title
$table = $this->getTable();
while ($table->load(array('title' => $title)))
while ($table->load(['title' => $title]))
{
$title = StringHelper::increment($title);
}