joomla/Component-Builder
40
26
Fork 12
Code Issues 82 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

176
admin/models/library.php
View File

@@ -12,10 +12,18 @@
// 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\GuidHelper;
@@ -102,16 +110,16 @@ class ComponentbuilderModelLibrary 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 = 'library', $prefix = 'ComponentbuilderTable', $config = array())
public function getTable($type = 'library', $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);
}
@@ -147,13 +155,12 @@ class ComponentbuilderModelLibrary extends AdminModel
ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
ComponentbuilderHelper::set('library__'.$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);
}
@@ -162,7 +169,7 @@ class ComponentbuilderModelLibrary extends AdminModel
return $this->vastDevMod;
}
/**
* Method to get a single record.
*
@@ -235,13 +242,12 @@ class ComponentbuilderModelLibrary extends AdminModel
ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
ComponentbuilderHelper::set('library__'.$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);
}
@@ -262,7 +268,7 @@ class ComponentbuilderModelLibrary 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;
@@ -289,7 +295,7 @@ class ComponentbuilderModelLibrary 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'))
@@ -302,7 +308,7 @@ class ComponentbuilderModelLibrary 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.
@@ -370,13 +376,13 @@ class ComponentbuilderModelLibrary 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/library.js';
}
/**
* Method to test whether a record can be deleted.
*
@@ -395,7 +401,7 @@ class ComponentbuilderModelLibrary extends AdminModel
return;
}
$user = JFactory::getUser();
$user = Factory::getUser();
// The record has been set. Check the record permissions.
return $user->authorise('library.delete', 'com_componentbuilder.library.' . (int) $record->id);
}
@@ -413,8 +419,8 @@ class ComponentbuilderModelLibrary 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)
{
@@ -428,28 +434,28 @@ class ComponentbuilderModelLibrary extends AdminModel
// In the absence of better information, revert to the component permissions.
return $user->authorise('library.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('library.edit', 'com_componentbuilder.library.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('library.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
*
@@ -457,19 +463,19 @@ class ComponentbuilderModelLibrary 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();
@@ -481,7 +487,7 @@ class ComponentbuilderModelLibrary 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_library'));
@@ -496,7 +502,7 @@ class ComponentbuilderModelLibrary extends AdminModel
$table->modified = $date->toSql();
$table->modified_by = $user->id;
}
if (!empty($table->id))
{
// Increment the items version number.
@@ -511,10 +517,10 @@ class ComponentbuilderModelLibrary 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.library.data', array());
$data = Factory::getApplication()->getUserState('com_componentbuilder.edit.library.data', []);
if (empty($data))
{
@@ -542,7 +548,7 @@ class ComponentbuilderModelLibrary 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);
@@ -550,7 +556,7 @@ class ComponentbuilderModelLibrary 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');
@@ -575,7 +581,7 @@ class ComponentbuilderModelLibrary extends AdminModel
return array('name', 'guid');
}
/**
* Method to delete one or more records.
*
@@ -588,7 +594,7 @@ class ComponentbuilderModelLibrary extends AdminModel
public function delete(&$pks)
{
// insure the locked library are not deleted
$app = JFactory::getApplication();
$app = Factory::getApplication();
foreach ($pks as $nr => $pk)
{
// remove if it is a locked library
@@ -597,7 +603,7 @@ class ComponentbuilderModelLibrary extends AdminModel
// do not allow delete
unset($pks[$nr]);
// set a message to remind them not to delete these libraries (since they are locked)
$app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK', ComponentbuilderHelper::$libraryNames[$pk]), 'warning');
$app->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK', ComponentbuilderHelper::$libraryNames[$pk]), 'warning');
}
}
// check if we can still continue
@@ -630,7 +636,7 @@ class ComponentbuilderModelLibrary extends AdminModel
}
}
}
return true;
}
@@ -671,10 +677,10 @@ class ComponentbuilderModelLibrary extends AdminModel
}
}
}
return true;
}
}
/**
* Method to perform batch operations on an item or a set of items.
*
@@ -700,30 +706,30 @@ class ComponentbuilderModelLibrary 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('library');
$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('library');
$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);
}
@@ -760,8 +766,7 @@ class ComponentbuilderModelLibrary extends AdminModel
if (!$done)
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
return false;
}
@@ -787,7 +792,7 @@ class ComponentbuilderModelLibrary 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('library');
@@ -813,7 +818,7 @@ class ComponentbuilderModelLibrary extends AdminModel
$values['published'] = 0;
}
$newIds = array();
$newIds = [];
// Parent exists so let's proceed
while (!empty($pks))
{
@@ -826,7 +831,7 @@ class ComponentbuilderModelLibrary extends AdminModel
if (!$this->user->authorise('library.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;
}
@@ -842,19 +847,19 @@ class ComponentbuilderModelLibrary 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;
}
}
// Only for strings
if (ComponentbuilderHelper::checkString($this->table->name) && !is_numeric($this->table->name))
if (UtilitiesStringHelper::check($this->table->name) && !is_numeric($this->table->name))
{
$this->table->name = $this->generateUnique('name',$this->table->name);
}
// insert all set values
if (ComponentbuilderHelper::checkArray($values))
if (UtilitiesArrayHelper::check($values))
{
foreach ($values as $key => $value)
{
@@ -866,7 +871,7 @@ class ComponentbuilderModelLibrary extends AdminModel
}
// update all unique fields
if (ComponentbuilderHelper::checkArray($uniqueFields))
if (UtilitiesArrayHelper::check($uniqueFields))
{
foreach ($uniqueFields as $uniqueField)
{
@@ -930,7 +935,7 @@ class ComponentbuilderModelLibrary 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('library');
@@ -938,7 +943,7 @@ class ComponentbuilderModelLibrary extends AdminModel
if (!$this->canDo->get('library.edit') && !$this->canDo->get('library.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
@@ -955,7 +960,7 @@ class ComponentbuilderModelLibrary extends AdminModel
{
if (!$this->user->authorise('library.edit', $contexts[$pk]))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
$this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
@@ -971,13 +976,13 @@ class ComponentbuilderModelLibrary 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)
{
@@ -1021,7 +1026,7 @@ class ComponentbuilderModelLibrary extends AdminModel
return true;
}
/**
* Method to save the form data.
*
@@ -1033,15 +1038,15 @@ class ComponentbuilderModelLibrary 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;
}
@@ -1064,7 +1069,7 @@ class ComponentbuilderModelLibrary extends AdminModel
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$libraries = new JRegistry;
$libraries = new Registry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
@@ -1077,7 +1082,7 @@ class ComponentbuilderModelLibrary extends AdminModel
// Set the addconditions items to data.
if (isset($data['addconditions']) && is_array($data['addconditions']))
{
$addconditions = new JRegistry;
$addconditions = new Registry;
$addconditions->loadArray($data['addconditions']);
$data['addconditions'] = (string) $addconditions;
}
@@ -1104,7 +1109,7 @@ class ComponentbuilderModelLibrary extends AdminModel
// change it back
$data['name'] = ComponentbuilderHelper::$libraryNames[$data['id']];
// give a notice that the name can not be changed
JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_NAME_OF_THIS_LIBRARY_BSB_CAN_NOT_BE_CHANGED_TO_BSB_OR_THINGS_WILL_BREAK', $data['name'], $name_), 'warning');
Factory::getApplication()->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_THE_NAME_OF_THIS_LIBRARY_BSB_CAN_NOT_BE_CHANGED_TO_BSB_OR_THINGS_WILL_BREAK', $data['name'], $name_), 'warning');
}
// always insure they remain set a main libraries
$data['type'] = 1;
@@ -1114,11 +1119,11 @@ class ComponentbuilderModelLibrary extends AdminModel
{
$data['name'] = $this->generateUniqe('name', $data['name']);
}
// 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;
}
@@ -1128,7 +1133,7 @@ class ComponentbuilderModelLibrary extends AdminModel
{
// Automatic handling of other unique fields
$uniqueFields = $this->getUniqueFields();
if (ComponentbuilderHelper::checkArray($uniqueFields))
if (UtilitiesArrayHelper::check($uniqueFields))
{
foreach ($uniqueFields as $uniqueField)
{
@@ -1136,14 +1141,14 @@ class ComponentbuilderModelLibrary extends AdminModel
}
}
}
if (parent::save($data))
{
return true;
}
return false;
}
/**
* Method to generate a unique value.
*
@@ -1156,7 +1161,6 @@ class ComponentbuilderModelLibrary extends AdminModel
*/
protected function generateUnique($field,$value)
{
// set field value unique
$table = $this->getTable();
@@ -1182,7 +1186,7 @@ class ComponentbuilderModelLibrary extends AdminModel
// Alter the title
$table = $this->getTable();
while ($table->load(array('title' => $title)))
while ($table->load(['title' => $title]))
{
$title = StringHelper::increment($title);
}