diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
index b5b787cf6e..91be588930 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_system.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -71,6 +71,22 @@
info['dbconnectioncollation']; ?>
+
+ |
+
+ |
+
+ info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
+ |
+
+
+ |
+
+ |
+
+ info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
+ |
+
diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml
index 75d3134253..e7e672ee41 100644
--- a/administrator/components/com_ajax/ajax.xml
+++ b/administrator/components/com_ajax/ajax.xml
@@ -13,15 +13,15 @@
ajax.php
- language/en-GB.com_ajax.ini
+ language/en-GB/com_ajax.ini
ajax.php
- language/en-GB.com_ajax.ini
- language/en-GB.com_ajax.sys.ini
+ language/en-GB/com_ajax.ini
+ language/en-GB/com_ajax.sys.ini
diff --git a/administrator/components/com_associations/Field/ItemlanguageField.php b/administrator/components/com_associations/Field/ItemlanguageField.php
index 3f23450b9c..49f0481736 100644
--- a/administrator/components/com_associations/Field/ItemlanguageField.php
+++ b/administrator/components/com_associations/Field/ItemlanguageField.php
@@ -60,7 +60,7 @@ protected function getOptions()
$canCreate = AssociationsHelper::allowAdd($extensionName, $typeName);
// Gets existing languages.
- $existingLanguages = LanguageHelper::getContentLanguages(array(0, 1));
+ $existingLanguages = LanguageHelper::getContentLanguages(array(0, 1), false);
$options = array();
diff --git a/administrator/components/com_associations/Field/Modal/AssociationField.php b/administrator/components/com_associations/Field/Modal/AssociationField.php
index f0ebb62078..3090a2d9e5 100644
--- a/administrator/components/com_associations/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/Field/Modal/AssociationField.php
@@ -45,8 +45,8 @@ protected function getInput()
// The active item id field.
$value = (int) $this->value > 0 ? (int) $this->value : '';
- Factory::getDocument()->addScriptOptions('modal-associations', ['itemId' => $value]);
- HTMLHelper::_('script', 'com_associations/modal-associations.min.js', ['version' => 'auto', 'relative' => true]);
+ Factory::getDocument()->addScriptOptions('admin_associations_modal', ['itemId' => $value]);
+ HTMLHelper::_('script', 'com_associations/admin_associations_modal.min.js', ['version' => 'auto', 'relative' => true]);
// Setup variables for display.
$html = array();
diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
index ecdcc48031..651a1b4c63 100644
--- a/administrator/components/com_associations/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -19,6 +19,7 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;
+use Joomla\Database\ParameterType;
use Joomla\Registry\Registry;
/**
@@ -222,7 +223,17 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title');
// Get all content languages.
- $languages = LanguageHelper::getContentLanguages(array(0, 1));
+ $languages = LanguageHelper::getContentLanguages(array(0, 1), false);
+ $content_languages = array_column($languages, 'lang_code');
+
+ // Display warning if Content Language is trashed or deleted
+ foreach ($items as $item)
+ {
+ if (!in_array($item['language'], $content_languages))
+ {
+ Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item['language']), 'warning');
+ }
+ }
$canEditReference = self::allowEdit($extensionName, $typeName, $itemId);
$canCreate = self::allowAdd($extensionName, $typeName);
@@ -263,12 +274,13 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$query = $db->getQuery(true)
->select($db->quoteName('title'))
->from($db->quoteName('#__categories'))
- ->where($db->quoteName('id') . ' = ' . $db->quote($items[$langCode]['catid']));
+ ->where($db->quoteName('id') . ' = :id')
+ ->bind(':id', $items[$langCode]['catid'], ParameterType::INTEGER);
$db->setQuery($query);
- $category_title = $db->loadResult();
+ $categoryTitle = $db->loadResult();
- $additional = '' . Text::sprintf('JCATEGORY_SPRINTF', $category_title) . '
';
+ $additional = '' . Text::sprintf('JCATEGORY_SPRINTF', $categoryTitle) . '
';
}
elseif (isset($items[$langCode]['menutype']))
{
@@ -278,12 +290,13 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$query = $db->getQuery(true)
->select($db->quoteName('title'))
->from($db->quoteName('#__menu_types'))
- ->where($db->quoteName('menutype') . ' = ' . $db->quote($items[$langCode]['menutype']));
+ ->where($db->quoteName('menutype') . ' = :menutype')
+ ->bind(':menutype', $items[$langCode]['menutype']);
$db->setQuery($query);
- $menutype_title = $db->loadResult();
+ $menutypeTitle = $db->loadResult();
- $additional = '' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutype_title) . '
';
+ $additional = '' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutypeTitle) . '
';
}
$labelClass = 'badge-secondary';
@@ -324,7 +337,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
. htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '
' . $additional;
$classes = 'badge ' . $labelClass;
- $items[$langCode]['link'] = '' . $text . ''
+ $items[$langCode]['link'] = '' . $text . ''
. '' . $tooltip . ' ';
}
diff --git a/administrator/components/com_associations/Model/AssociationsModel.php b/administrator/components/com_associations/Model/AssociationsModel.php
index d4e0d2379f..42d1fb221a 100644
--- a/administrator/components/com_associations/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/Model/AssociationsModel.php
@@ -18,6 +18,7 @@
use Joomla\CMS\Table\Table;
use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
use Joomla\Database\Exception\ExecutionFailureException;
+use Joomla\Database\ParameterType;
/**
* Methods supporting a list of article records.
@@ -231,16 +232,27 @@ protected function getListQuery()
$query->select($db->quoteName($fields['language'], 'language'))
->select($db->quoteName('l.title', 'language_title'))
->select($db->quoteName('l.image', 'language_image'))
- ->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName($fields['language']));
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__languages', 'l'),
+ $db->quoteName('l.lang_code') . ' = ' . $db->quoteName($fields['language'])
+ );
+ $extensionNameItem = $extensionName . '.item';
// Join over the associations.
$query->select('COUNT(' . $db->quoteName('asso2.id') . ') > 1 AS ' . $db->quoteName('association'))
->join(
'LEFT',
- $db->quoteName('#__associations', 'asso') . ' ON ' . $db->quoteName('asso.id') . ' = ' . $db->quoteName($fields['id'])
- . ' AND ' . $db->quoteName('asso.context') . ' = ' . $db->quote($extensionName . '.item')
+ $db->quoteName('#__associations', 'asso'),
+ $db->quoteName('asso.id') . ' = ' . $db->quoteName($fields['id'])
+ . ' AND ' . $db->quoteName('asso.context') . ' = :context'
+ )
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__associations', 'asso2'),
+ $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key')
)
- ->join('LEFT', $db->quoteName('#__associations', 'asso2') . ' ON ' . $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key'));
+ ->bind(':context', $extensionNameItem);
// Prepare the group by clause.
$groupby = array(
@@ -268,7 +280,11 @@ protected function getListQuery()
// Join over the users.
$query->select($db->quoteName('u.name', 'editor'))
- ->join('LEFT', $db->quoteName('#__users', 'u') . ' ON ' . $db->quoteName('u.id') . ' = ' . $db->quoteName($fields['checked_out']));
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__users', 'u'),
+ $db->quoteName('u.id') . ' = ' . $db->quoteName($fields['checked_out'])
+ );
$groupby[] = 'u.name';
$groupby[] = $fields['checked_out'];
@@ -306,7 +322,11 @@ protected function getListQuery()
// Join over the categories.
$query->select($db->quoteName('c.title', 'category_title'))
- ->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName($fields['catid']));
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__categories', 'c'),
+ $db->quoteName('c.id') . ' = ' . $db->quoteName($fields['catid'])
+ );
$groupby[] = 'c.title';
$groupby[] = $fields['catid'];
@@ -320,7 +340,11 @@ protected function getListQuery()
// Join over the menu types.
$query->select($db->quoteName('mt.title', 'menutype_title'))
->select($db->quoteName('mt.id', 'menutypeid'))
- ->join('LEFT', $db->quoteName('#__menu_types', 'mt') . ' ON ' . $db->quoteName('mt.menutype') . ' = ' . $db->quoteName($fields['menutype']));
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__menu_types', 'mt'),
+ $db->quoteName('mt.menutype') . ' = ' . $db->quoteName($fields['menutype'])
+ );
$groupby[] = 'mt.title';
$groupby[] = 'mt.id';
@@ -334,7 +358,11 @@ protected function getListQuery()
// Join over the access levels.
$query->select($db->quoteName('ag.title', 'access_level'))
- ->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->quoteName('ag.id') . ' = ' . $db->quoteName($fields['access']));
+ ->join(
+ 'LEFT',
+ $db->quoteName('#__viewlevels', 'ag'),
+ $db->quoteName('ag.id') . ' = ' . $db->quoteName($fields['access'])
+ );
$groupby[] = 'ag.title';
$groupby[] = $fields['access'];
@@ -342,7 +370,8 @@ protected function getListQuery()
// Implement View Level Access.
if (!$user->authorise('core.admin', $extensionName))
{
- $query->where($fields['access'] . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
+ $groups = $user->getAuthorisedViewLevels();
+ $query->whereIn($db->quoteName($fields['access']), $groups);
}
}
@@ -356,21 +385,25 @@ protected function getListQuery()
// If component item type is category we need to remove all other component categories.
if ($typeName === 'category')
{
- $query->where($db->quoteName('a.extension') . ' = ' . $db->quote($extensionName));
+ $query->where($db->quoteName('a.extension') . ' = :extensionname')
+ ->bind(':extensionname', $extensionName);
}
elseif ($typeNameExploded = explode('.', $typeName))
{
if (count($typeNameExploded) > 1 && array_pop($typeNameExploded) === 'category')
{
$section = implode('.', $typeNameExploded);
- $query->where($db->quoteName('a.extension') . ' = ' . $db->quote($extensionName . '.' . $section));
+ $extensionNameSection = $extensionName . '.' . $section;
+ $query->where($db->quoteName('a.extension') . ' = :extensionsection')
+ ->bind(':extensionsection', $extensionNameSection);
}
}
// Filter on the language.
if ($language = $this->getState('language'))
{
- $query->where($db->quoteName($fields['language']) . ' = ' . $db->quote($language));
+ $query->where($db->quoteName($fields['language']) . ' = :language')
+ ->bind(':language', $language);
}
// Filter by item state.
@@ -378,11 +411,13 @@ protected function getListQuery()
if (is_numeric($state))
{
- $query->where($db->quoteName($fields['state']) . ' = ' . (int) $state);
+ $state = (int) $state;
+ $query->where($db->quoteName($fields['state']) . ' = :state')
+ ->bind(':state', $state, ParameterType::INTEGER);
}
elseif ($state === '')
{
- $query->where($db->quoteName($fields['state']) . ' IN (0, 1)');
+ $query->whereIn($db->quoteName($fields['state']), [0, 1]);
}
// Filter on the category.
@@ -394,26 +429,35 @@ protected function getListQuery()
$categoryTable->load($categoryId);
$baselevel = (int) $categoryTable->level;
- $query->where($db->quoteName('c.lft') . ' >= ' . (int) $categoryTable->lft)
- ->where($db->quoteName('c.rgt') . ' <= ' . (int) $categoryTable->rgt);
+ $lft = (int) $categoryTable->lft;
+ $rgt = (int) $categoryTable->rgt;
+ $query->where($db->quoteName('c.lft') . ' >= :lft')
+ ->where($db->quoteName('c.rgt') . ' <= :rgt')
+ ->bind(':lft', $lft, ParameterType::INTEGER)
+ ->bind(':rgt', $rgt, ParameterType::INTEGER);
}
// Filter on the level.
if ($level = $this->getState('filter.level'))
{
- $query->where($db->quoteName('a.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
+ $queryLevel = ((int) $level + (int) $baselevel - 1);
+ $query->where($db->quoteName('a.level') . ' <= :alevel')
+ ->bind(':alevel', $queryLevel, ParameterType::INTEGER);
}
// Filter by menu type.
if ($menutype = $this->getState('filter.menutype'))
{
- $query->where($fields['menutype'] . ' = ' . $db->quote($menutype));
+ $query->where($db->quoteName($fields['menutype']) . ' = :menutype2')
+ ->bind(':menutype2', $menutype);
}
// Filter by access level.
if ($access = $this->getState('filter.access'))
{
- $query->where($fields['access'] . ' = ' . (int) $access);
+ $access = (int) $access;
+ $query->where($db->quoteName($fields['access']) . ' = :access')
+ ->bind(':access', $access, ParameterType::INTEGER);
}
// Filter by search in name.
@@ -421,14 +465,18 @@ protected function getListQuery()
{
if (stripos($search, 'id:') === 0)
{
- $query->where($db->quoteName($fields['id']) . ' = ' . (int) substr($search, 3));
+ $search = (int) substr($search, 3);
+ $query->where($db->quoteName($fields['id']) . ' = :searchid')
+ ->bind(':searchid', $search, ParameterType::INTEGER);
}
else
{
- $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
- $query->where('(' . $db->quoteName($fields['title']) . ' LIKE ' . $search
- . ' OR ' . $db->quoteName($fields['alias']) . ' LIKE ' . $search . ')'
- );
+ $search = '%' . str_replace(' ', '%', trim($search)) . '%';
+ $query->where('(' . $db->quoteName($fields['title']) . ' LIKE :title'
+ . ' OR ' . $db->quoteName($fields['alias']) . ' LIKE :alias)'
+ )
+ ->bind(':title', $search)
+ ->bind(':alias', $search);
}
}
@@ -463,13 +511,15 @@ public function purge($context = '', $key = '')
// Filter by associations context.
if ($context)
{
- $query->where($db->quoteName('context') . ' = ' . $db->quote($context));
+ $query->where($db->quoteName('context') . ' = :context')
+ ->bind(':context', $context);
}
// Filter by key.
if ($key)
{
- $query->where($db->quoteName('key') . ' = ' . $db->quote($key));
+ $query->where($db->quoteName('key') . ' = :key')
+ ->bind(':key', $key);
}
$db->setQuery($query);
@@ -516,13 +566,15 @@ public function clean($context = '', $key = '')
// Filter by associations context.
if ($context)
{
- $query->where($db->quoteName('context') . ' = ' . $db->quote($context));
+ $query->where($db->quoteName('context') . ' = :context')
+ ->bind(':context', $context);
}
// Filter by key.
if ($key)
{
- $query->where($db->quoteName('key') . ' = ' . $db->quote($key));
+ $query->where($db->quoteName('key') . ' = :key')
+ ->bind(':key', $key);
}
$db->setQuery($query);
@@ -536,7 +588,8 @@ public function clean($context = '', $key = '')
{
$query->clear()
->delete($db->quoteName('#__associations'))
- ->where($db->quoteName('key') . ' = ' . $db->quote($value->key));
+ ->where($db->quoteName('key') . ' = :valuekey')
+ ->bind(':valuekey', $value->key);
$db->setQuery($query);
diff --git a/administrator/components/com_associations/View/Association/HtmlView.php b/administrator/components/com_associations/View/Association/HtmlView.php
index f1a412e225..3569ef1207 100644
--- a/administrator/components/com_associations/View/Association/HtmlView.php
+++ b/administrator/components/com_associations/View/Association/HtmlView.php
@@ -11,13 +11,21 @@
defined('_JEXEC') or die;
+use Joomla\CMS\Application\AdministratorApplication;
use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Pagination\Pagination;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
+use Joomla\Component\Associations\Administrator\Model\AssociationModel;
+use Joomla\Input\Input;
+use Joomla\Registry\Registry;
use Joomla\Utilities\ArrayHelper;
/**
@@ -34,12 +42,12 @@ class HtmlView extends BaseHtmlView
*
* @since 3.7.0
*/
- protected $items;
+ protected $items = [];
/**
* The pagination object
*
- * @var \Joomla\CMS\Pagination\Pagination
+ * @var Pagination
*
* @since 3.7.0
*/
@@ -48,7 +56,7 @@ class HtmlView extends BaseHtmlView
/**
* The model state
*
- * @var object
+ * @var CMSObject
*
* @since 3.7.0
*/
@@ -57,11 +65,147 @@ class HtmlView extends BaseHtmlView
/**
* Selected item type properties.
*
- * @var \Joomla\Registry\Registry
+ * @var Registry
*
* @since 3.7.0
*/
- public $itemType = null;
+ protected $itemType;
+
+ /**
+ * The application
+ *
+ * @var AdministratorApplication
+ * @since 3.7.0
+ */
+ protected $app;
+
+ /**
+ * The ID of the reference language
+ *
+ * @var integer
+ * @since 3.7.0
+ */
+ protected $referenceId = 0;
+
+ /**
+ * The type name
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $typeName = '';
+
+ /**
+ * The reference language
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $referenceLanguage = '';
+
+ /**
+ * The title of the reference language
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $referenceTitle = '';
+
+ /**
+ * The value of the reference title
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $referenceTitleValue = '';
+
+ /**
+ * The URL to the edit screen
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $editUri = '';
+
+ /**
+ * The ID of the target field
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $targetId = '';
+
+ /**
+ * The target language
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $targetLanguage = '';
+
+ /**
+ * The source of the target field
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $defaultTargetSrc = '';
+
+ /**
+ * The action to perform for the target field
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $targetAction = '';
+
+ /**
+ * The title of the target field
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ protected $targetTitle = '';
+
+ /**
+ * The edit form
+ *
+ * @var Form
+ * @since 3.7.0
+ */
+ protected $form;
+
+ /**
+ * Set if the option is set to save as copy
+ *
+ * @var boolean
+ * @since 3.7.0
+ */
+ private $save2copy = false;
+
+ /**
+ * The type of language
+ *
+ * @var Registry
+ * @since 3.7.0
+ */
+ private $type;
+
+ /**
+ * The supported types
+ *
+ * @var array
+ * @since 3.7.0
+ */
+ private $typeSupports = [];
+
+ /**
+ * The extension name
+ *
+ * @var string
+ * @since 3.7.0
+ */
+ private $extensionName = '';
/**
* Display the view
@@ -71,36 +215,42 @@ class HtmlView extends BaseHtmlView
* @return void
*
* @since 3.7.0
+ *
* @throws \Exception
*/
- public function display($tpl = null)
+ public function display($tpl = null): void
{
+ /** @var AssociationModel $model */
+ $model = $this->getModel();
+
// Check for errors.
- if (count($errors = $this->get('Errors')))
+ if (count($errors = $model->getErrors()))
{
- throw new \Exception(implode("\n", $errors), 500);
+ throw new GenericDataException(implode("\n", $errors), 500);
}
$this->app = Factory::getApplication();
- $this->form = $this->get('Form');
- $input = $this->app->input;
+ $this->form = $model->getForm();
+ /** @var Input $input */
+ $input = $this->app->input;
$this->referenceId = $input->get('id', 0, 'int');
- list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'), 2);
+ [$extensionName, $typeName] = explode('.', $input->get('itemtype', '', 'string'), 2);
+ /** @var Registry $extension */
$extension = AssociationsHelper::getSupportedExtension($extensionName);
$types = $extension->get('types');
if (array_key_exists($typeName, $types))
{
- $this->type = $types[$typeName];
- $this->typeSupports = array();
- $details = $this->type->get('details');
- $this->save2copy = false;
+ $this->type = $types[$typeName];
+ $this->typeSupports = [];
+ $details = $this->type->get('details');
+ $this->save2copy = false;
if (array_key_exists('support', $details))
{
- $support = $details['support'];
+ $support = $details['support'];
$this->typeSupports = $support;
}
@@ -112,14 +262,15 @@ public function display($tpl = null)
$this->extensionName = $extensionName;
$this->typeName = $typeName;
- $this->itemtype = $extensionName . '.' . $typeName;
+ $this->itemType = $extensionName . '.' . $typeName;
$languageField = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'language');
$referenceId = $input->get('id', 0, 'int');
$reference = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
- $this->referenceLanguage = $reference[$languageField];
- $this->referenceTitle = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+ $this->referenceLanguage = $reference[$languageField];
+ $this->referenceTitle = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+ $this->referenceTitleValue = $reference[$this->referenceTitle];
// Check for special case category
$typeNameExploded = explode('.', $typeName);
@@ -133,21 +284,21 @@ public function display($tpl = null)
$extensionName .= '.' . implode('.', $typeNameExploded);
}
- $options = array(
+ $options = [
'option' => 'com_categories',
'view' => 'category',
'extension' => $extensionName,
'tmpl' => 'component',
- );
+ ];
}
else
{
- $options = array(
+ $options = [
'option' => $extensionName,
'view' => $typeName,
'extension' => $extensionName,
'tmpl' => 'component',
- );
+ ];
}
// Reference and target edit links.
@@ -162,19 +313,18 @@ public function display($tpl = null)
if ($target = $input->get('target', '', 'string'))
{
- $matches = preg_split("#[\:]+#", $target);
- $this->targetAction = $matches[2];
- $this->targetId = $matches[1];
- $this->targetLanguage = $matches[0];
- $this->targetTitle = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
- $task = $typeName . '.' . $this->targetAction;
-
- /*
+ $matches = preg_split("#[\:]+#", $target);
+ $this->targetAction = $matches[2];
+ $this->targetId = $matches[1];
+ $this->targetLanguage = $matches[0];
+ $this->targetTitle = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+ $task = $typeName . '.' . $this->targetAction;
+
+ /**
* Let's put the target src into a variable to use in the javascript code
- * to avoid race conditions when the reference iframe loads.
+ * to avoid race conditions when the reference iframe loads.
*/
- $document = Factory::getDocument();
- $document->addScriptOptions('targetSrc', Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId));
+ $this->document->addScriptOptions('targetSrc', Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId));
$this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction);
}
@@ -189,11 +339,13 @@ public function display($tpl = null)
* @return void
*
* @since 3.7.0
+ *
+ * @throws \Exception
*/
- protected function addToolbar()
+ protected function addToolbar(): void
{
// Hide main menu.
- Factory::getApplication()->input->set('hidemainmenu', 1);
+ $this->app->input->set('hidemainmenu', 1);
$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
$title = $helper->getTypeTitle($this->typeName);
@@ -205,9 +357,16 @@ protected function addToolbar()
$languageKey = strtoupper($this->extensionName) . '_CATEGORIES';
}
- ToolbarHelper::title(Text::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', Text::_($this->extensionName), Text::_($languageKey)), 'language assoc');
+ ToolbarHelper::title(
+ Text::sprintf(
+ 'COM_ASSOCIATIONS_TITLE_EDIT',
+ Text::_($this->extensionName),
+ Text::_($languageKey)
+ ),
+ 'language assoc'
+ );
- $bar = Toolbar::getInstance('toolbar');
+ $bar = Toolbar::getInstance();
$bar->appendButton(
'Custom', ' |