-
diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
index 0ae8648b5fbf9..a9ee34202fcd2 100644
--- a/administrator/components/com_postinstall/src/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -68,7 +68,7 @@ public function getItem($id)
$db = $this->getDatabase();
$id = (int) $id;
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('postinstall_message_id'),
@@ -110,7 +110,7 @@ public function unpublishMessage($id)
$db = $this->getDatabase();
$id = (int) $id;
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query
->update($db->quoteName('#__postinstall_messages'))
->set($db->quoteName('enabled') . ' = 0')
@@ -135,7 +135,7 @@ public function archiveMessage($id)
$db = $this->getDatabase();
$id = (int) $id;
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query
->update($db->quoteName('#__postinstall_messages'))
->set($db->quoteName('enabled') . ' = 2')
@@ -160,7 +160,7 @@ public function republishMessage($id)
$db = $this->getDatabase();
$id = (int) $id;
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query
->update($db->quoteName('#__postinstall_messages'))
->set($db->quoteName('enabled') . ' = 1')
@@ -187,7 +187,7 @@ public function getItems()
$cacheId = 'postinstall_messages.' . $eid;
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('postinstall_message_id'),
@@ -244,7 +244,7 @@ public function getItems()
public function getItemsCount()
{
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('language_extension'),
@@ -296,7 +296,7 @@ public function getExtensionName($eid)
$db = $this->getDatabase();
$eid = (int) $eid;
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('name'),
@@ -345,7 +345,7 @@ public function resetMessages($eid)
$db = $this->getDatabase();
$eid = (int) $eid;
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__postinstall_messages'))
->set($db->quoteName('enabled') . ' = 1')
->where($db->quoteName('extension_id') . ' = :eid')
@@ -372,7 +372,7 @@ public function hideMessages($eid)
$db = $this->getDatabase();
$eid = (int) $eid;
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__postinstall_messages'))
->set($db->quoteName('enabled') . ' = 0')
->where($db->quoteName('extension_id') . ' = :eid')
@@ -453,7 +453,7 @@ public function getComponentOptions()
{
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__postinstall_messages'))
->group($db->quoteName('extension_id'));
@@ -668,7 +668,7 @@ public function addPostInstallationMessage(array $options)
$extensionId = (int) $options['extension_id'];
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('*')
->from($db->quoteName($tableName))
->where(
@@ -701,7 +701,7 @@ public function addPostInstallationMessage(array $options)
}
// Otherwise it's not the same row. Remove the old row before insert a new one.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName($tableName))
->where(
[
diff --git a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
index 325cfc48b3877..1d4b8250ea485 100644
--- a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
+++ b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
@@ -73,7 +73,7 @@ public static function renderDataAsXml(array $exportData)
public static function getPrivacyConsentPluginId()
{
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
diff --git a/administrator/components/com_privacy/src/Model/ConsentsModel.php b/administrator/components/com_privacy/src/Model/ConsentsModel.php
index ccfcbb0eec388..76617f0a97ad2 100644
--- a/administrator/components/com_privacy/src/Model/ConsentsModel.php
+++ b/administrator/components/com_privacy/src/Model/ConsentsModel.php
@@ -65,7 +65,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Select the required fields from the table.
$query->select($this->getState('list.select', 'a.*'));
@@ -182,7 +182,7 @@ public function invalidate($pks)
try {
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__privacy_consents'))
->set($db->quoteName('state') . ' = -1')
->whereIn($db->quoteName('id'), $pks)
@@ -209,7 +209,7 @@ public function invalidateAll($subject)
{
try {
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__privacy_consents'))
->set($db->quoteName('state') . ' = -1')
->where($db->quoteName('subject') . ' = :subject')
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index 8ae502d1d713b..4b52545761e66 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -85,7 +85,7 @@ public function collectDataForExportRequest($id = null)
$db = $this->getDatabase();
$userId = (int) $db->setQuery(
- $db->getQuery(true)
+ $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__users'))
->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -179,7 +179,7 @@ public function emailDataExport($id = null)
$db = $this->getDatabase();
$userId = (int) $db->setQuery(
- $db->getQuery(true)
+ $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__users'))
->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/administrator/components/com_privacy/src/Model/RemoveModel.php b/administrator/components/com_privacy/src/Model/RemoveModel.php
index 864e79a840455..741840031510f 100644
--- a/administrator/components/com_privacy/src/Model/RemoveModel.php
+++ b/administrator/components/com_privacy/src/Model/RemoveModel.php
@@ -81,7 +81,7 @@ public function removeDataForRequest($id = null)
$db = $this->getDatabase();
$userId = (int) $db->setQuery(
- $db->getQuery(true)
+ $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__users'))
->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/administrator/components/com_privacy/src/Model/RequestModel.php b/administrator/components/com_privacy/src/Model/RequestModel.php
index 47b531c848b6e..fdd6886309711 100644
--- a/administrator/components/com_privacy/src/Model/RequestModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestModel.php
@@ -264,7 +264,7 @@ public function notifyUserAdminCreatedRequest($id)
$db = $this->getDatabase();
$userId = (int) $db->setQuery(
- $db->getQuery(true)
+ $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__users'))
->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -411,7 +411,7 @@ public function validate($form, $data, $group = null)
// Check for an active request for this email address
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('COUNT(id)')
->from($db->quoteName('#__privacy_requests'))
->where($db->quoteName('email') . ' = :email')
diff --git a/administrator/components/com_privacy/src/Model/RequestsModel.php b/administrator/components/com_privacy/src/Model/RequestsModel.php
index f28ac566aba2e..4b2724ffb377f 100644
--- a/administrator/components/com_privacy/src/Model/RequestsModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestsModel.php
@@ -62,7 +62,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Select the required fields from the table.
$query->select($this->getState('list.select', 'a.*'));
@@ -171,7 +171,7 @@ public function getNumberUrgentRequests()
$period = '-' . $notify;
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('COUNT(*)');
$query->from($db->quoteName('#__privacy_requests'));
$query->where($db->quoteName('status') . ' = 1 ');
diff --git a/administrator/components/com_privacy/src/View/Consents/HtmlView.php b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
index 95bfd32591708..0c9403f7ef7fe 100644
--- a/administrator/components/com_privacy/src/View/Consents/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
@@ -105,6 +105,11 @@ public function display($tpl = null)
$this->setLayout('emptystate');
}
+ // Add form control fields
+ $this->filterForm
+ ->addControlField('task', '')
+ ->addControlField('boxchecked', '0');
+
$this->addToolbar();
parent::display($tpl);
diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php
index 968e806e8a2c0..0a5e4cf82a342 100644
--- a/administrator/components/com_privacy/src/View/Request/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php
@@ -98,6 +98,10 @@ public function display($tpl = null)
// Variables only required for the edit layout
if ($this->getLayout() === 'edit') {
$this->form = $model->getForm();
+
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '');
}
$this->addToolbar();
diff --git a/administrator/components/com_privacy/src/View/Requests/HtmlView.php b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
index 14e52693dc7b5..453b232a6c83e 100644
--- a/administrator/components/com_privacy/src/View/Requests/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
@@ -117,6 +117,11 @@ public function display($tpl = null)
$this->setLayout('emptystate');
}
+ // Add form control fields
+ $this->filterForm
+ ->addControlField('task', '')
+ ->addControlField('boxchecked', '0');
+
$this->addToolbar();
parent::display($tpl);
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index 73d9e7fd90c28..0f26a4228b6a8 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -123,8 +123,6 @@
-
-
-
+ filterForm->renderControlFields(); ?>
+
-
-
+ form->renderControlFields(); ?>
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index f56129c5dacd5..d279a8e30af94 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -146,8 +146,6 @@
-
-
-
+ filterForm->renderControlFields(); ?>
+ ![]()
+
@@ -51,6 +66,26 @@ export default {
showActions: false,
};
},
+ computed: {
+ thumbURL() {
+ let path = this.item.thumb_path || '';
+
+ if (path && this.item.modified_date) {
+ path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+ }
+
+ return path;
+ },
+ thumbWidth() {
+ return this.item.thumb_width || null;
+ },
+ thumbHeight() {
+ return this.item.thumb_height || null;
+ },
+ thumbLoading() {
+ return this.item.thumb_width ? 'lazy' : null;
+ },
+ },
methods: {
/* Hide actions dropdown */
hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
index d665740532b7b..9a20a481f30ca 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
@@ -9,8 +9,23 @@
@dblclick.stop.prevent="onPreviewDblClick()"
@keyup.enter="onPreviewDblClick()"
>
-
-
diff --git a/administrator/components/com_plugins/src/Field/PluginorderingField.php b/administrator/components/com_plugins/src/Field/PluginorderingField.php
index 42e8b36257efc..396a3ae2aa2c7 100644
--- a/administrator/components/com_plugins/src/Field/PluginorderingField.php
+++ b/administrator/components/com_plugins/src/Field/PluginorderingField.php
@@ -42,7 +42,7 @@ protected function getQuery()
$folder = $this->form->getValue('folder');
// Build the query for the ordering list.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('ordering', 'value'),
diff --git a/administrator/components/com_plugins/src/Helper/PluginsHelper.php b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
index a32bea364ed84..5f00603036283 100644
--- a/administrator/components/com_plugins/src/Helper/PluginsHelper.php
+++ b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
@@ -13,7 +13,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Installer\Installer;
-use Joomla\CMS\Object\CMSObject;
use Joomla\Filesystem\Path;
// phpcs:disable PSR1.Files.SideEffects
@@ -52,7 +51,7 @@ public static function publishedOptions()
public static function folderOptions()
{
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('DISTINCT(folder) AS value, folder AS text')
->from('#__extensions')
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -77,7 +76,7 @@ public static function folderOptions()
public static function elementOptions()
{
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('DISTINCT(element) AS value, element AS text')
->from('#__extensions')
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -99,11 +98,11 @@ public static function elementOptions()
* @param string $templateBaseDir Base path to the template directory.
* @param string $templateDir Template directory.
*
- * @return CMSObject|bool
+ * @return \stdClass|bool
*/
public function parseXMLTemplateFile($templateBaseDir, $templateDir)
{
- $data = new CMSObject();
+ $data = new \stdClass();
// Check of the xml file exists.
$filePath = Path::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index c12192d5dbd91..2aae139e0dcfd 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Table\Table;
use Joomla\Filesystem\Path;
@@ -177,9 +176,9 @@ public function getItem($pk = null)
return false;
}
- // Convert to the \Joomla\CMS\Object\CMSObject before adding other data.
+ // Convert to an object before adding other data.
$properties = $table->getProperties(1);
- $this->_cache[$cacheId] = ArrayHelper::toObject($properties, CMSObject::class);
+ $this->_cache[$cacheId] = ArrayHelper::toObject($properties);
// Convert the params field to an array.
$registry = new Registry($table->params);
@@ -254,7 +253,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
// Load the core and/or local language sys file(s) for the ordering field.
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('element'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -361,15 +360,13 @@ public function getHelp()
/**
* Custom clean cache method, plugins are cached in 2 places for different clients.
*
- * @param string $group Cache group name.
- * @param integer $clientId No longer used, will be removed without replacement
- * @deprecated 4.3 will be removed in 6.0
+ * @param string $group Cache group name.
*
* @return void
*
* @since 1.6
*/
- protected function cleanCache($group = null, $clientId = 0)
+ protected function cleanCache($group = null)
{
parent::cleanCache('com_plugins');
}
diff --git a/administrator/components/com_plugins/src/Model/PluginsModel.php b/administrator/components/com_plugins/src/Model/PluginsModel.php
index 50d193fd1cb5c..a20c718ab6184 100644
--- a/administrator/components/com_plugins/src/Model/PluginsModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginsModel.php
@@ -203,7 +203,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Select the required fields from the table.
$query->select(
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 0eeb114fd2816..da021a2a16d82 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -81,6 +81,10 @@ public function display($tpl = null)
return;
}
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '');
+
if ($this->getLayout() !== 'modal') {
$this->addToolbar();
} else {
diff --git a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
index e9713aff4a18f..854440cf47e85 100644
--- a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
@@ -83,6 +83,11 @@ public function display($tpl = null)
$this->filterForm = $model->getFilterForm();
$this->activeFilters = $model->getActiveFilters();
+ // Add form control fields
+ $this->filterForm
+ ->addControlField('task', '')
+ ->addControlField('boxchecked', '0');
+
$this->addToolbar();
parent::display($tpl);
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php
index 1939185cd5f6d..3660b9321376f 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit.php
@@ -134,6 +134,5 @@
+
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
index d9df032a63371..f375c6c268fd9 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
@@ -19,6 +19,8 @@
'formURL' => 'index.php?option=com_newsfeeds&view=newsfeeds',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:News_Feeds',
'icon' => 'icon-rss newsfeeds',
+
+ 'controlFields' => $this->filterForm->renderControlFields(),
];
$user = $this->getCurrentUser();
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index e048cc5bbf434..0f6ee1029dff7 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -139,10 +139,7 @@
-
-
-
-
+ filterForm->renderControlFields(); ?>
+ ![]()
+
@@ -47,6 +62,26 @@ export default {
showActions: false,
};
},
+ computed: {
+ thumbURL() {
+ let path = this.item.thumb_path || '';
+
+ if (path && this.item.modified_date) {
+ path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+ }
+
+ return path;
+ },
+ thumbWidth() {
+ return this.item.thumb_width || null;
+ },
+ thumbHeight() {
+ return this.item.thumb_height || null;
+ },
+ thumbLoading() {
+ return this.item.thumb_width ? 'lazy' : null;
+ },
+ },
methods: {
/* Handle the on preview double click event */
onPreviewDblClick() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/document.vue b/administrator/components/com_media/resources/scripts/components/browser/items/document.vue
index e8a259f6a6afc..183f58192a3ba 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/document.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/document.vue
@@ -5,8 +5,23 @@
@mouseleave="hideActions()"
>
-
-
+
-
-
-
+
+ form->renderControlFields(); ?>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index 5b1cf424eb896..1d2a205d34067 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -186,9 +186,8 @@
loadTemplate('batch_body'); ?>
-
-
-
+
+ filterForm->renderControlFields(); ?>
+ ![]()
+
@@ -54,6 +69,26 @@ export default {
showActions: false,
};
},
+ computed: {
+ thumbURL() {
+ let path = this.item.thumb_path || '';
+
+ if (path && this.item.modified_date) {
+ path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+ }
+
+ return path;
+ },
+ thumbWidth() {
+ return this.item.thumb_width || null;
+ },
+ thumbHeight() {
+ return this.item.thumb_height || null;
+ },
+ thumbLoading() {
+ return this.item.thumb_width ? 'lazy' : null;
+ },
+ },
methods: {
/* Hide actions dropdown */
hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
index 2b816f6e75ade..71a486d0157fe 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
@@ -4,8 +4,23 @@
@mouseleave="hideActions()"
>
-
diff --git a/administrator/components/com_modules/tmpl/modules/emptystate.php b/administrator/components/com_modules/tmpl/modules/emptystate.php
index 75450cad12077..c6d28d0a0ce5d 100644
--- a/administrator/components/com_modules/tmpl/modules/emptystate.php
+++ b/administrator/components/com_modules/tmpl/modules/emptystate.php
@@ -22,6 +22,8 @@
'icon' => 'icon-cube module',
// Although it is (almost) impossible to get to this page with no created Administrator Modules, we add this for completeness.
'title' => Text::_('COM_MODULES_EMPTYSTATE_TITLE_' . ($this->clientId ? 'ADMINISTRATOR' : 'SITE')),
+
+ 'controlFields' => $this->filterForm->renderControlFields(),
];
if ($this->getCurrentUser()->authorise('core.create', 'com_modules')) {
diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
index 97ed426e7ce8b..834174f3e5454 100644
--- a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
if ($value) {
try {
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('name'))
->from($db->quoteName('#__newsfeeds'))
->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
index a4975ea91a467..d41a20203c93b 100644
--- a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
+++ b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
@@ -44,7 +44,7 @@ protected function getOptions()
$options = [];
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('id', 'value'),
diff --git a/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php b/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
index f7cbdebf3aa2c..213e3eb0b4d68 100644
--- a/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
@@ -11,8 +11,11 @@
namespace Joomla\Component\Newsfeeds\Administrator\Helper;
use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Category;
use Joomla\CMS\Table\Table;
+use Joomla\Component\Newsfeeds\Administrator\Table\NewsfeedTable;
use Joomla\Component\Newsfeeds\Site\Helper\AssociationHelper;
// phpcs:disable PSR1.Files.SideEffects
@@ -124,11 +127,11 @@ public function getItem($typeName, $id)
switch ($typeName) {
case 'newsfeed':
- $table = Table::getInstance('NewsfeedTable', 'Joomla\\Component\\Newsfeeds\\Administrator\\Table\\');
+ $table = new NewsfeedTable(Factory::getDbo());
break;
case 'category':
- $table = Table::getInstance('Category');
+ $table = new Category(Factory::getDbo());
break;
}
diff --git a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
index d2733fe1ddc32..febf63625bfa8 100644
--- a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
+++ b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
@@ -44,7 +44,7 @@ class NewsfeedsHelper extends ContentHelper
public static function countItems(&$items)
{
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('published', 'state'),
@@ -101,7 +101,7 @@ public static function countItems(&$items)
public static function countTagItems(&$items, $extension)
{
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$parts = explode('.', $extension);
$section = null;
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
index 90878c7430696..724a326890276 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -17,6 +17,7 @@
use Joomla\CMS\Language\Associations;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Versioning\VersionableModelInterface;
use Joomla\CMS\Versioning\VersionableModelTrait;
use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
use Joomla\Registry\Registry;
@@ -30,7 +31,7 @@
*
* @since 1.6
*/
-class NewsfeedModel extends AdminModel
+class NewsfeedModel extends AdminModel implements VersionableModelInterface
{
use VersionableModelTrait;
@@ -156,8 +157,8 @@ protected function loadFormData()
// Prime some default values.
if ($this->getState('newsfeed.id') == 0) {
- $app = Factory::getApplication();
- $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
+ $app = Factory::getApplication();
+ $data->catid = $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int');
}
}
@@ -310,7 +311,7 @@ protected function prepareTable($table)
// Set ordering to the last item if not set
if (empty($table->ordering)) {
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('MAX(' . $db->quoteName('ordering') . ')')
->from($db->quoteName('#__newsfeeds'));
$db->setQuery($query);
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
index 6d806ec3a06fd..e7a62b1f7c61e 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
@@ -147,7 +147,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$user = $this->getCurrentUser();
// Select the required fields from the table.
@@ -191,7 +191,7 @@ protected function getListQuery()
// Join over the associations.
if (Associations::isEnabled()) {
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
->from($db->quoteName('#__associations', 'asso1'))
->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -278,7 +278,7 @@ protected function getListQuery()
$includeNone = true;
}
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('content_item_id'))
->from($db->quoteName('#__contentitem_tag_map'))
->where(
@@ -295,7 +295,7 @@ protected function getListQuery()
);
if ($includeNone) {
- $subQuery2 = $db->getQuery(true)
+ $subQuery2 = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('content_item_id'))
->from($db->quoteName('#__contentitem_tag_map'))
->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
@@ -313,7 +313,7 @@ protected function getListQuery()
$tag = (int) $tag;
if ($tag === 0) {
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('content_item_id'))
->from($db->quoteName('#__contentitem_tag_map'))
->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
diff --git a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
index 1de326795b4f3..97d94dd5d12ce 100644
--- a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
@@ -51,7 +51,7 @@ public function association($newsfeedid)
// Get the associated newsfeed items
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query
->select(
[
diff --git a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
index 58a4f4c686695..0aa0f05208fea 100644
--- a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
+++ b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
@@ -177,7 +177,7 @@ public function store($updateNulls = true)
}
// Verify that the alias is unique
- $table = Table::getInstance('NewsfeedTable', __NAMESPACE__ . '\\', ['dbo' => $this->getDatabase()]);
+ $table = new self($this->getDatabase());
if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
// Is the existing newsfeed trashed?
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index 151f87a3f817a..e8fe4d62651a3 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -93,7 +93,9 @@ public function display($tpl = null)
}
// If we are forcing a language in modal (used for associations).
- if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
+ $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd');
+
+ if ($this->getLayout() === 'modal' && $forcedLanguage) {
// Set the language field to the forcedLanguage and disable changing it.
$this->form->setValue('language', null, $forcedLanguage);
$this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -105,6 +107,11 @@ public function display($tpl = null)
$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
}
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '')
+ ->addControlField('forcedLanguage', $forcedLanguage);
+
if ($this->getLayout() !== 'modal') {
$this->addToolbar();
} else {
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
index df52945d15a32..6ea49aed017c0 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
@@ -105,6 +105,11 @@ public function display($tpl = null)
$this->setLayout('emptystate');
}
+ // Add form control fields
+ $this->filterForm
+ ->addControlField('task', '')
+ ->addControlField('boxchecked', '0');
+
// We don't need toolbar in the modal layout.
if ($this->getLayout() !== 'modal') {
$this->addToolbar();
@@ -117,7 +122,9 @@ public function display($tpl = null)
} else {
// In article associations modal we need to remove language filter if forcing a language.
// We also need to change the category filter to show show categories with All or the forced language.
- if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
+ $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD');
+
+ if ($forcedLanguage) {
// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
$languageXml = new \SimpleXMLElement('
-
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index 5928d7c24d6e3..becb6f31d764c 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -200,15 +200,10 @@
authorise('core.create', 'com_modules')
- && $user->authorise('core.edit', 'com_modules')
- && $user->authorise('core.edit.state', 'com_modules')
- ) : ?>
+ if ($this->batchAllowed) : ?>
loadTemplate('batch_body'); ?>
-
-
-
+
+ filterForm->renderControlFields(); ?>
+
![]()
@@ -71,7 +71,7 @@ export default {
};
},
computed: {
- getURL() {
+ thumbURL() {
if (!this.item.thumb_path) {
return '';
}
@@ -80,16 +80,16 @@ export default {
? `${this.item.thumb_path}?${this.item.modified_date ? new Date(this.item.modified_date).valueOf() : api.mediaVersion}`
: `${this.item.thumb_path}`;
},
- width() {
- return this.item.width > 0 ? this.item.width : null;
+ thumbWidth() {
+ return this.item.thumb_width || this.item.width || null;
},
- height() {
- return this.item.height > 0 ? this.item.height : null;
+ thumbHeight() {
+ return this.item.thumb_height || this.item.height || null;
},
- loading() {
- return this.item.width > 0 ? 'lazy' : null;
+ thumbLoading() {
+ return this.thumbWidth ? 'lazy' : null;
},
- altTag() {
+ thumbAlt() {
return this.item.name;
},
},
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
index 9f8fc8c9b7bd4..184bb16f748b2 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
@@ -5,8 +5,23 @@
@mouseleave="hideActions()"
>
-
-
+
+ form->renderControlFields(); ?>
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index f79eb7488bdd7..abf0723a9c2c2 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.php
@@ -89,10 +89,7 @@
pagination->getListFooter(); ?>
-
diff --git a/administrator/components/com_messages/tmpl/messages/emptystate.php b/administrator/components/com_messages/tmpl/messages/emptystate.php
index 5b4eb77cbdf61..362c22b6aa95d 100644
--- a/administrator/components/com_messages/tmpl/messages/emptystate.php
+++ b/administrator/components/com_messages/tmpl/messages/emptystate.php
@@ -19,6 +19,8 @@
'formURL' => 'index.php?option=com_messages&view=messages',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Private_Messages',
'icon' => 'icon-envelope inbox',
+
+ 'controlFields' => $this->filterForm->renderControlFields(),
];
if (
diff --git a/administrator/components/com_modules/src/Controller/ModuleController.php b/administrator/components/com_modules/src/Controller/ModuleController.php
index f6b14678e9f69..9d8c49f6b37e9 100644
--- a/administrator/components/com_modules/src/Controller/ModuleController.php
+++ b/administrator/components/com_modules/src/Controller/ModuleController.php
@@ -232,7 +232,7 @@ public function save($key = null, $urlVar = null)
$model = $this->getModel();
$data = $this->input->post->get('jform', [], 'array');
$item = $model->getItem($this->input->get('id'));
- $properties = $item->getProperties();
+ $properties = get_object_vars($item);
if (isset($data['params'])) {
unset($properties['params']);
diff --git a/administrator/components/com_modules/src/Helper/ModulesHelper.php b/administrator/components/com_modules/src/Helper/ModulesHelper.php
index fac753b736857..8a32dda43bfac 100644
--- a/administrator/components/com_modules/src/Helper/ModulesHelper.php
+++ b/administrator/components/com_modules/src/Helper/ModulesHelper.php
@@ -71,7 +71,7 @@ public static function getPositions($clientId, $editPositions = false)
{
$db = Factory::getDbo();
$clientId = (int) $clientId;
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('position'))
->from($db->quoteName('#__modules'))
->where($db->quoteName('client_id') . ' = :clientid')
@@ -120,7 +120,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
$clientId = (int) $clientId;
// Get the database object and a new query object.
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Build the query.
$query->select($db->quoteName(['element', 'name', 'enabled']))
@@ -157,7 +157,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
public static function getModules($clientId)
{
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('element AS value, name AS text')
->from('#__extensions as e')
->where('e.client_id = ' . (int) $clientId)
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 9e8d5b17d57c0..2d2d16d131e42 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -18,7 +18,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Table\Table;
@@ -202,7 +201,7 @@ protected function batchCopy($value, $pks, $contexts)
// Now we need to handle the module assignments
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('menuid'))
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -356,7 +355,7 @@ public function delete(&$pks)
// Delete the menu assignments
$pk = (int) $pk;
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = :moduleid')
->bind(':moduleid', $pk, ParameterType::INTEGER);
@@ -426,7 +425,7 @@ public function duplicate(&$pks)
}
$pk = (int) $pk;
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('menuid'))
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -445,7 +444,7 @@ public function duplicate(&$pks)
if (!empty($tuples)) {
// Module-Menu Mapping: Do it in one query
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->insert($db->quoteName('#__modules_menu'))
->columns($db->quoteName(['moduleid', 'menuid']))
->values($tuples);
@@ -597,12 +596,12 @@ protected function loadFormData()
// Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
if (!$data->id) {
- $clientId = $input->getInt('client_id', 0);
- $filters = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
- $data->set('published', $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
- $data->set('position', $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
- $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
- $data->set('access', $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
+ $clientId = $input->getInt('client_id', 0);
+ $filters = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
+ $data->published = $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));
+ $data->position = $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null));
+ $data->language = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+ $data->access = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
}
// Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
@@ -611,7 +610,7 @@ protected function loadFormData()
$params = $app->getUserState('com_modules.add.module.params');
if (\is_array($params)) {
- $data->set('params', $params);
+ $data->params = $params;
}
}
}
@@ -626,7 +625,7 @@ protected function loadFormData()
*
* @param integer $pk The id of the primary key.
*
- * @return mixed Object on success, false on failure.
+ * @return \stdClass|false Object on success, false on failure.
*
* @since 1.6
*/
@@ -652,7 +651,7 @@ public function getItem($pk = null)
// Check if we are creating a new extension.
if (empty($pk)) {
if ($extensionId = (int) $this->getState('extension.id')) {
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName(['element', 'client_id']))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -684,16 +683,16 @@ public function getItem($pk = null)
}
}
- // Convert to the \Joomla\CMS\Object\CMSObject before adding other data.
+ // Convert to an object before adding other data.
$properties = $table->getProperties(1);
- $this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class);
+ $this->_cache[$pk] = ArrayHelper::toObject($properties);
// Convert the params field to an array.
$registry = new Registry($table->params);
$this->_cache[$pk]->params = $registry->toArray();
// Determine the page assignment mode.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('menuid'))
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -966,7 +965,7 @@ public function save($data)
// Delete old module to menu item associations
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = :moduleid')
->bind(':moduleid', $table->id, ParameterType::INTEGER);
@@ -1090,15 +1089,13 @@ protected function getReorderConditions($table)
/**
* Custom clean cache method for different clients
*
- * @param string $group The name of the plugin group to import (defaults to null).
- * @param integer $clientId No longer used, will be removed without replacement
- * @deprecated 4.3 will be removed in 6.0
+ * @param string $group Cache group name.
*
* @return void
*
* @since 1.6
*/
- protected function cleanCache($group = null, $clientId = 0)
+ protected function cleanCache($group = null)
{
parent::cleanCache('com_modules');
}
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index 2ad18918777d0..1c193f541ca3e 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -249,7 +249,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Select the required fields.
$query->select(
@@ -346,7 +346,7 @@ protected function getListQuery()
} else {
// If user selected the modules assigned to some particular page (menu item).
// Modules in "All" pages.
- $subQuery1 = $db->getQuery(true);
+ $subQuery1 = $db->createQuery();
$subQuery1->select('MIN(' . $db->quoteName('menuid') . ')')
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('moduleid') . ' = ' . $db->quoteName('a.id'));
@@ -354,13 +354,13 @@ protected function getListQuery()
// Modules in "Selected" pages that have the chosen menu item id.
$menuItemId = (int) $menuItemId;
$minusMenuItemId = $menuItemId * -1;
- $subQuery2 = $db->getQuery(true);
+ $subQuery2 = $db->createQuery();
$subQuery2->select($db->quoteName('moduleid'))
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('menuid') . ' = :menuitemid2');
// Modules in "All except selected" pages that doesn't have the chosen menu item id.
- $subQuery3 = $db->getQuery(true);
+ $subQuery3 = $db->createQuery();
$subQuery3->select($db->quoteName('moduleid'))
->from($db->quoteName('#__modules_menu'))
->where($db->quoteName('menuid') . ' = :menuitemid3');
diff --git a/administrator/components/com_modules/src/Model/PositionsModel.php b/administrator/components/com_modules/src/Model/PositionsModel.php
index 0351c13dc8363..3d99a58ace4e6 100644
--- a/administrator/components/com_modules/src/Model/PositionsModel.php
+++ b/administrator/components/com_modules/src/Model/PositionsModel.php
@@ -105,7 +105,7 @@ public function getItems()
// Get the database object and a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('position', 'value'))
->from($db->quoteName('#__modules'))
->where($db->quoteName('client_id') . ' = :clientid')
diff --git a/administrator/components/com_modules/src/Model/SelectModel.php b/administrator/components/com_modules/src/Model/SelectModel.php
index 643ca24503046..9a2fb6212e44b 100644
--- a/administrator/components/com_modules/src/Model/SelectModel.php
+++ b/administrator/components/com_modules/src/Model/SelectModel.php
@@ -90,7 +90,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Select the required fields from the table.
$query->select(
diff --git a/administrator/components/com_modules/src/Service/HTML/Modules.php b/administrator/components/com_modules/src/Service/HTML/Modules.php
index 78b02e6e90582..51aac634362fe 100644
--- a/administrator/components/com_modules/src/Service/HTML/Modules.php
+++ b/administrator/components/com_modules/src/Service/HTML/Modules.php
@@ -230,7 +230,7 @@ public function positionList($clientId = 0)
{
$clientId = (int) $clientId;
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('position', 'value'))
->select($db->quoteName('position', 'text'))
->from($db->quoteName('#__modules'))
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index 4037f50637bf7..4de41713f860c 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -100,6 +100,11 @@ public function display($tpl = null)
return;
}
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '')
+ ->addControlField('return', Factory::getApplication()->getInput()->getBase64('return', ''));
+
if ($this->getLayout() !== 'modal') {
$this->addToolbar();
} else {
diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php
index 6ea5738c2d11e..a8d71a3c54a9e 100644
--- a/administrator/components/com_modules/src/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php
@@ -14,11 +14,8 @@
use Joomla\CMS\Helper\ContentHelper;
use Joomla\CMS\Helper\ModuleHelper;
use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\Button\DropdownButton;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Modules\Administrator\Model\ModulesModel;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\View\ListView;
// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
@@ -29,80 +26,61 @@
*
* @since 1.6
*/
-class HtmlView extends BaseHtmlView
+class HtmlView extends ListView
{
/**
- * An array of items
+ * The client ID for the modules we're showing
*
- * @var array
- */
- protected $items;
-
- /**
- * The pagination object
+ * @var int
*
- * @var \Joomla\CMS\Pagination\Pagination
+ * @since 6.0.0
*/
- protected $pagination;
+ protected $clientId;
/**
- * The model state
+ * The help link for the view
*
- * @var \Joomla\Registry\Registry
+ * @var string
*/
- protected $state;
+ protected $helpLink = 'Modules';
/**
- * Form object for search filters
+ * Constructor
*
- * @var \Joomla\CMS\Form\Form
- *
- * @since 4.0.0
+ * @param array $config An optional associative array of configuration settings.
*/
- public $filterForm;
+ public function __construct(array $config)
+ {
+ if (empty($config['option'])) {
+ $config['option'] = 'com_modules';
+ }
- /**
- * The active search filters
- *
- * @var array
- * @since 4.0.0
- */
- public $activeFilters;
+ $config['toolbar_icon'] = 'cube module';
+ $config['supports_batch'] = true;
- /**
- * Is this view an Empty State
- *
- * @var boolean
- * @since 4.0.0
- */
- private $isEmptyState = false;
+ parent::__construct($config);
+ }
/**
- * Display the view
- *
- * @param string $tpl The name of the template file to parse; automatically searches through the template paths.
+ * Prepare view data
*
* @return void
- *
- * @since 1.6
*/
- public function display($tpl = null)
+ protected function initializeView()
{
- /** @var ModulesModel $model */
+ parent::initializeView();
+
+ /**
+ * @var ListModel
+ */
$model = $this->getModel();
- $model->setUseExceptions(true);
- $this->items = $model->getItems();
- $this->pagination = $model->getPagination();
- $this->state = $model->getState();
$this->total = $model->getTotal();
- $this->filterForm = $model->getFilterForm();
- $this->activeFilters = $model->getActiveFilters();
- $this->clientId = $this->state->get('client_id');
+ $this->clientId = (int) $this->state->get('client_id', 0);
- if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) {
- $this->setLayout('emptystate');
- }
+ $this->canDo = ContentHelper::getActions('com_modules');
+
+ $this->toolbarTitle = $this->clientId == 1 ? 'COM_MODULES_MANAGER_MODULES_ADMIN' : 'COM_MODULES_MANAGER_MODULES_SITE';
/**
* The code below make sure the remembered position will be available from filter dropdown even if there are no
@@ -137,8 +115,6 @@ public function display($tpl = null)
// We don't need the toolbar in the modal window.
if ($this->getLayout() !== 'modal') {
- $this->addToolbar();
-
// We do not need to filter by language when multilingual is disabled
if (!Multilanguage::isEnabled()) {
unset($this->activeFilters['language']);
@@ -154,8 +130,6 @@ public function display($tpl = null)
unset($this->activeFilters['state'], $this->activeFilters['language']);
}
}
-
- parent::display($tpl);
}
/**
@@ -167,78 +141,42 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
- $state = $this->state;
- $canDo = ContentHelper::getActions('com_modules');
- $user = $this->getCurrentUser();
+ $canDo = $this->canDo;
- // Get the toolbar object instance
- $toolbar = $this->getDocument()->getToolbar();
+ $canCreate = $canDo->get('core.create');
- if ($state->get('client_id') == 1) {
- ToolbarHelper::title(Text::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module');
- } else {
- ToolbarHelper::title(Text::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module');
+ if ($canCreate) {
+ $this->getDocument()->getToolbar()->standardButton('new', 'JTOOLBAR_NEW')
+ ->onclick("location.href='index.php?option=com_modules&view=select&client_id=" . $this->clientId . "'");
}
- if ($canDo->get('core.create')) {
- $toolbar->standardButton('new', 'JTOOLBAR_NEW')
- ->onclick("location.href='index.php?option=com_modules&view=select&client_id=" . $this->state->get('client_id', 0) . "'");
- }
+ // Prevent showing default add button
+ $canDo->set('core.create', false);
- if (!$this->isEmptyState && ($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin'))) {
- /** @var DropdownButton $dropdown */
- $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
- ->toggleSplit(false)
- ->icon('icon-ellipsis-h')
- ->buttonClass('btn btn-action')
- ->listCheck(true);
+ parent::addToolbar();
- $childBar = $dropdown->getChildToolbar();
+ $canDo->set('core.create', $canCreate);
- if ($canDo->get('core.edit.state')) {
- $childBar->publish('modules.publish')->listCheck(true);
+ // We add the duplicate button if there is the default dropdown
+ if ($canCreate) {
- $childBar->unpublish('modules.unpublish')->listCheck(true);
- }
+ /**
+ * @var \Joomla\CMS\Toolbar\Toolbar $toolbar
+ */
+ $toolbar = $this->getDocument()->getToolbar();
- if ($this->getCurrentUser()->authorise('core.admin')) {
- $childBar->checkin('modules.checkin')->listCheck(true);
- }
+ $buttons = $toolbar->getItems();
- if ($canDo->get('core.edit.state') && $this->state->get('filter.published') != -2) {
- $childBar->trash('modules.trash')->listCheck(true);
- }
+ foreach ($buttons as $button) {
+ if ($button->getName() === 'status-group') {
+ $childBar = $button->getChildToolbar();
- // Add a batch button
- if (
- $user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules')
- && $user->authorise('core.edit.state', 'com_modules')
- ) {
- $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
- ->popupType('inline')
- ->textHeader(Text::_('COM_MODULES_BATCH_OPTIONS'))
- ->url('#joomla-dialog-batch')
- ->modalWidth('800px')
- ->modalHeight('fit-content')
- ->listCheck(true);
- }
+ $childBar->standardButton('copy', 'JTOOLBAR_DUPLICATE', 'modules.duplicate')
+ ->listCheck(true);
- if ($canDo->get('core.create')) {
- $childBar->standardButton('copy', 'JTOOLBAR_DUPLICATE', 'modules.duplicate')
- ->listCheck(true);
+ break;
+ }
}
}
-
- if (!$this->isEmptyState && ($state->get('filter.state') == -2 && $canDo->get('core.delete'))) {
- $toolbar->delete('modules.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
- ->message('JGLOBAL_CONFIRM_DELETE')
- ->listCheck(true);
- }
-
- if ($canDo->get('core.admin')) {
- $toolbar->preferences('com_modules');
- }
-
- $toolbar->help('Modules');
}
}
diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index 45a819a54cfa9..9ff59422a7351 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -18,8 +18,6 @@
/** @var \Joomla\Component\Modules\Administrator\View\Module\HtmlView $this */
-HTMLHelper::_('behavior.combobox');
-
$hasContent = isset($this->item->xml->customContent);
$hasContentFieldName = 'content';
@@ -39,10 +37,10 @@
$this->getDocument()->addScriptOptions('module-edit', ['itemId' => $this->item->id, 'state' => (int) $this->item->id == 0 ? 'Add' : 'Edit']);
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('keepalive')
- ->useScript('form.validate');
+$this->getDocument()->getWebAssetManager()
+ ->useScript('keepalive')
+ ->useScript('form.validate')
+ ->useScript('awesomplete');
$input = Factory::getApplication()->getInput();
@@ -189,10 +187,9 @@
-
-
-
form->getInput('module'); ?>
form->getInput('client_id'); ?>
+
+ form->renderControlFields(); ?>
+ ![]()
+
@@ -53,6 +68,26 @@ export default {
showActions: false,
};
},
+ computed: {
+ thumbURL() {
+ let path = this.item.thumb_path || '';
+
+ if (path && this.item.modified_date) {
+ path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+ }
+
+ return path;
+ },
+ thumbWidth() {
+ return this.item.thumb_width || null;
+ },
+ thumbHeight() {
+ return this.item.thumb_height || null;
+ },
+ thumbLoading() {
+ return this.item.thumb_width ? 'lazy' : null;
+ },
+ },
methods: {
/* Hide actions dropdown */
hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
index f8d1606b22c3a..1950a1ece88fd 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -12,17 +12,17 @@
>
-
-
-
-
+ form->renderControlFields(); ?>
diff --git a/administrator/components/com_messages/tmpl/message/default.php b/administrator/components/com_messages/tmpl/message/default.php
index 9d0a626586d3e..dbec384a36b3c 100644
--- a/administrator/components/com_messages/tmpl/message/default.php
+++ b/administrator/components/com_messages/tmpl/message/default.php
@@ -33,7 +33,7 @@
+
+ ![]()
+
@@ -49,6 +64,26 @@ export default {
showActions: false,
};
},
+ computed: {
+ thumbURL() {
+ let path = this.item.thumb_path || '';
+
+ if (path && this.item.modified_date) {
+ path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+ }
+
+ return path;
+ },
+ thumbWidth() {
+ return this.item.thumb_width || null;
+ },
+ thumbHeight() {
+ return this.item.thumb_height || null;
+ },
+ thumbLoading() {
+ return this.item.thumb_width ? 'lazy' : null;
+ },
+ },
methods: {
/* Hide actions dropdown */
hideActions() {
diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
index d98f24e0cf1fa..b77055df0dbe4 100644
--- a/administrator/components/com_media/src/Model/ApiModel.php
+++ b/administrator/components/com_media/src/Model/ApiModel.php
@@ -14,7 +14,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\Component\Media\Administrator\Event\FetchMediaItemEvent;
use Joomla\Component\Media\Administrator\Event\FetchMediaItemsEvent;
@@ -180,7 +179,7 @@ public function createFolder($adapter, $name, $path, $override)
}
$app = Factory::getApplication();
- $object = new CMSObject();
+ $object = new \stdClass();
$object->adapter = $adapter;
$object->name = $name;
$object->path = $path;
@@ -235,7 +234,7 @@ public function createFile($adapter, $name, $path, $data, $override)
}
$app = Factory::getApplication();
- $object = new CMSObject();
+ $object = new \stdClass();
$object->adapter = $adapter;
$object->name = $name;
$object->path = $path;
@@ -283,7 +282,7 @@ public function updateFile($adapter, $name, $path, $data)
}
$app = Factory::getApplication();
- $object = new CMSObject();
+ $object = new \stdClass();
$object->adapter = $adapter;
$object->name = $name;
$object->path = $path;
@@ -330,7 +329,7 @@ public function delete($adapter, $path)
$type = $file->type === 'file' ? 'file' : 'folder';
$app = Factory::getApplication();
- $object = new CMSObject();
+ $object = new \stdClass();
$object->adapter = $adapter;
$object->path = $path;
diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml
index 4ab2c5916e3c8..5e1fa9accb56d 100644
--- a/administrator/components/com_menus/presets/alternate.xml
+++ b/administrator/components/com_menus/presets/alternate.xml
@@ -294,7 +294,7 @@
title="COM_CONTENT_MENUS_FEATURED"
type="component"
element="com_content"
- link="index.php?option=com_content&view=featured"
+ link="index.php?option=com_content&view=articles&filter[featured]=1"
/>
diff --git a/administrator/components/com_menus/src/Controller/AjaxController.php b/administrator/components/com_menus/src/Controller/AjaxController.php
index abad401c45737..a2740f22b915b 100644
--- a/administrator/components/com_menus/src/Controller/AjaxController.php
+++ b/administrator/components/com_menus/src/Controller/AjaxController.php
@@ -10,12 +10,14 @@
namespace Joomla\Component\Menus\Administrator\Controller;
+use Joomla\CMS\Factory;
use Joomla\CMS\Language\Associations;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Menu;
use Joomla\CMS\Table\Table;
// phpcs:disable PSR1.Files.SideEffects
@@ -62,7 +64,7 @@ public function fetchAssociations()
// Add the title to each of the associated records
Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables');
- $menuTable = Table::getInstance('Menu', '\\Joomla\\CMS\\Table\\', []);
+ $menuTable = new Menu(Factory::getDbo());
foreach ($associations as $association) {
$menuTable->load($association->id);
diff --git a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
index 929a5cf40c714..53068e1c67648 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
@@ -43,7 +43,7 @@ protected function getOptions()
$db = $this->getDatabase();
$options = [];
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select('DISTINCT ' . $db->quoteName('extensions.element'))
->from($db->quoteName('#__menu', 'menu'))
->join(
diff --git a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
index b61f54500888f..7399a0de3fb12 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
@@ -188,7 +188,7 @@ protected function getGroups()
if ($menuType) {
// If the menutype is empty, group the items by menutype.
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('title'))
->from($db->quoteName('#__menu_types'))
->where($db->quoteName('menutype') . ' = :menuType')
diff --git a/administrator/components/com_menus/src/Field/MenuOrderingField.php b/administrator/components/com_menus/src/Field/MenuOrderingField.php
index 63009de9eaadb..c3af813e96a58 100644
--- a/administrator/components/com_menus/src/Field/MenuOrderingField.php
+++ b/administrator/components/com_menus/src/Field/MenuOrderingField.php
@@ -54,7 +54,7 @@ protected function getOptions()
}
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/MenuParentField.php b/administrator/components/com_menus/src/Field/MenuParentField.php
index 432293e6c6970..4bd84e2a93fab 100644
--- a/administrator/components/com_menus/src/Field/MenuParentField.php
+++ b/administrator/components/com_menus/src/Field/MenuParentField.php
@@ -46,7 +46,7 @@ protected function getOptions()
$options = [];
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
'DISTINCT ' . $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
index 683583a150444..f86ce5e4364b1 100644
--- a/administrator/components/com_menus/src/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -241,7 +241,7 @@ protected function getValueTitle()
if ($value) {
try {
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('title'))
->from($db->quoteName('#__menu'))
->where($db->quoteName('id') . ' = :id')
diff --git a/administrator/components/com_menus/src/Helper/AssociationsHelper.php b/administrator/components/com_menus/src/Helper/AssociationsHelper.php
index e7cb3817d68b8..be9560f3562a0 100644
--- a/administrator/components/com_menus/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_menus/src/Helper/AssociationsHelper.php
@@ -11,7 +11,9 @@
namespace Joomla\Component\Menus\Administrator\Helper;
use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Menu;
use Joomla\CMS\Table\Table;
// phpcs:disable PSR1.Files.SideEffects
@@ -117,7 +119,7 @@ public function getItem($typeName, $id)
switch ($typeName) {
case 'item':
- $table = Table::getInstance('menu');
+ $table = new Menu(Factory::getDbo());
break;
}
diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
index 4ab707b1de506..01063a402a9fa 100644
--- a/administrator/components/com_menus/src/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -19,7 +19,7 @@
use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Menu\AdministratorMenuItem;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Menu;
use Joomla\Database\DatabaseInterface;
use Joomla\Database\ParameterType;
use Joomla\Filesystem\File;
@@ -106,9 +106,10 @@ public static function getLinkKey($request)
public static function getMenuTypes($clientId = 0)
{
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('a.menutype'))
- ->from($db->quoteName('#__menu_types', 'a'));
+ ->from($db->quoteName('#__menu_types', 'a'))
+ ->order($db->quoteName('ordering'));
if (isset($clientId)) {
$clientId = (int) $clientId;
@@ -142,7 +143,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
$clientId = (int) $clientId;
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
'DISTINCT ' . $db->quoteName('a.id', 'value'),
@@ -217,13 +218,13 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
if (empty($menuType)) {
// If the menutype is empty, group the items by menutype.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('*')
->from($db->quoteName('#__menu_types'))
->where($db->quoteName('menutype') . ' <> ' . $db->quote(''))
->order(
[
- $db->quoteName('title'),
+ $db->quoteName('ordering'),
$db->quoteName('menutype'),
]
);
@@ -302,7 +303,7 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
{
$root = new AdministratorMenuItem();
$db = Factory::getContainer()->get(DatabaseInterface::class);
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Prepare the query.
$query->select($db->quoteName('m') . '.*')
@@ -428,7 +429,7 @@ public static function installPreset($preset, $menutype)
protected static function installPresetItems($node, $menutype)
{
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$items = $node->getChildren();
static $components = [];
@@ -455,8 +456,7 @@ protected static function installPresetItems($node, $menutype)
]))->getArgument('subject', $items);
foreach ($items as $item) {
- /** @var \Joomla\CMS\Table\Menu $table */
- $table = Table::getInstance('Menu');
+ $table = new Menu($db);
$item->alias = $menutype . '-' . $item->title;
@@ -509,7 +509,7 @@ protected static function installPresetItems($node, $menutype)
}
}
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__menu'))
->whereIn($db->quoteName('component_id'), $hideitems);
@@ -697,7 +697,7 @@ public static function resolveAlias(&$item)
$aliasTo = (int) $obj->getParams()->get('aliasoptions');
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('a.id'),
@@ -790,7 +790,7 @@ protected static function loadXml($elements, $parent, $replace = [])
$iJoin = (string) $element['sql_innerjoin'];
$db = Factory::getDbo();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select($select)->from($from);
if ($where) {
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 2d46b9df704d1..85da394860016 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -157,7 +157,7 @@ protected function batchCopy($value, $pks, $contexts)
$table = $this->getTable();
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$newIds = [];
// Check that the parent exists
@@ -234,7 +234,7 @@ protected function batchCopy($value, $pks, $contexts)
}
// Copy is a bit tricky, because we also need to copy the children
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__menu'))
->where(
@@ -409,7 +409,7 @@ protected function batchMove($value, $pks, $contexts)
// Check if we are moving to a different menu
if ($menuType != $table->menutype) {
// Add the child node ids to the children array.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('id'))
->from($db->quoteName('#__menu'))
->where($db->quoteName('lft') . ' BETWEEN :lft AND :rgt')
@@ -448,7 +448,7 @@ protected function batchMove($value, $pks, $contexts)
$children = ArrayHelper::toInteger($children);
// Update the menutype field in all nodes where necessary.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__menu'))
->set($db->quoteName('menutype') . ' = :menuType')
->whereIn($db->quoteName('id'), $children)
@@ -784,7 +784,7 @@ public function getModules()
}
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
/**
* Join on the module-to-menu mapping table.
@@ -808,7 +808,7 @@ public function getModules()
. ' AND ' . $db->quoteName('map.menuid') . ' IN (' . implode(',', $query->bindArray([0, $id, -$id])) . ')'
);
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select('COUNT(*)')
->from($db->quoteName('#__modules_menu'))
->where(
@@ -860,7 +860,7 @@ public function getModules()
public function getViewLevels()
{
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
// Get all the available view levels
$query->select($db->quoteName('id'))
@@ -1232,7 +1232,7 @@ public function rebuild()
{
// Initialise variables.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$table = $this->getTable();
try {
@@ -1272,7 +1272,7 @@ public function rebuild()
return false;
}
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__menu'))
->set($db->quoteName('params') . ' = :params')
->where($db->quoteName('id') . ' = :id')
@@ -1314,7 +1314,7 @@ public function save($data)
$pk = $data['id'] ?? (int) $this->getState('item.id');
$isNew = true;
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$table = $this->getTable();
$context = $this->option . '.' . $this->name;
@@ -1434,7 +1434,7 @@ public function save($data)
$children = ArrayHelper::toInteger($children);
// Update the menutype field in all nodes where necessary.
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__menu'))
->set($db->quoteName('menutype') . ' = :menutype')
->whereIn($db->quoteName('id'), $children)
@@ -1476,7 +1476,7 @@ public function save($data)
// Get associationskey for edited item
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('key'))
->from($db->quoteName('#__associations'))
->where(
@@ -1493,7 +1493,7 @@ public function save($data)
if ($associations || $oldKey !== null) {
// Deleting old associations for the associated items
$where = [];
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__associations'))
->where($db->quoteName('context') . ' = :context')
->bind(':context', $this->associationsContext);
@@ -1527,7 +1527,7 @@ public function save($data)
if (\count($associations) > 1) {
// Adding new association for these items
$key = md5(json_encode($associations));
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->insert($db->quoteName('#__associations'))
->columns(
[
@@ -1746,15 +1746,13 @@ protected function generateNewTitle($parentId, $alias, $title)
/**
* Custom clean the cache
*
- * @param string $group Cache group name.
- * @param integer $clientId No longer used, will be removed without replacement
- * @deprecated 4.3 will be removed in 6.0
+ * @param string $group Cache group name.
*
* @return void
*
* @since 1.6
*/
- protected function cleanCache($group = null, $clientId = 0)
+ protected function cleanCache($group = null)
{
parent::cleanCache('com_menus');
parent::cleanCache('com_modules');
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index 0ccf3ab1aa9d7..4426754ffca0b 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -225,7 +225,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$user = $this->getCurrentUser();
$clientId = (int) $this->getState('filter.client_id');
@@ -302,7 +302,7 @@ protected function getListQuery()
// Join over the associations.
if (Associations::isEnabled()) {
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
->from($db->quoteName('#__associations', 'asso1'))
->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -368,7 +368,7 @@ protected function getListQuery()
if ($parentId) {
// Create a subquery for the sub-items list
- $subQuery = $db->getQuery(true)
+ $subQuery = $db->createQuery()
->select($db->quoteName('sub.id'))
->from($db->quoteName('#__menu', 'sub'))
->join(
@@ -406,7 +406,7 @@ protected function getListQuery()
// A value "" means all
if ($menuType == '') {
// Load all menu types we have manage access
- $query2 = $db->getQuery(true)
+ $query2 = $db->createQuery()
->select(
[
$db->quoteName('id'),
@@ -416,7 +416,7 @@ protected function getListQuery()
->from($db->quoteName('#__menu_types'))
->where($db->quoteName('client_id') . ' = :clientId')
->bind(':clientId', $clientId, ParameterType::INTEGER)
- ->order($db->quoteName('title'));
+ ->order($db->quoteName('ordering'));
// Show protected items on explicit filter only
$query->where($db->quoteName('a.menutype') . ' != ' . $db->quote('main'));
@@ -518,7 +518,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
protected function getMenu($menuType, $check = false)
{
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select($db->quoteName('a') . '.*')
->from($db->quoteName('#__menu_types', 'a'))
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
index 27f2feee24c41..068dfa8587325 100644
--- a/administrator/components/com_menus/src/Model/MenuModel.php
+++ b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -14,7 +14,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Form\Form;
use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Table\Table;
use Joomla\Registry\Registry;
@@ -121,7 +120,7 @@ protected function populateState()
*
* @param integer $itemId The id of the menu item to get.
*
- * @return mixed Menu item data object on success, false on failure.
+ * @return \stdClass|false Menu item data object on success, false on failure.
*
* @since 1.6
*/
@@ -143,7 +142,7 @@ public function getItem($itemId = null)
}
$properties = $table->getProperties(1);
- $value = ArrayHelper::toObject($properties, CMSObject::class);
+ $value = ArrayHelper::toObject($properties);
return $value;
}
@@ -342,7 +341,7 @@ public function &getModules()
{
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('a.id'),
@@ -388,7 +387,7 @@ public function &getModules()
public function getExtensionElementsForMenuItems(array $itemIds): array
{
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query
->select($db->quoteName('e.element'))
@@ -402,15 +401,13 @@ public function getExtensionElementsForMenuItems(array $itemIds): array
/**
* Custom clean the cache
*
- * @param string $group Cache group name.
- * @param integer $clientId No longer used, will be removed without replacement
- * @deprecated 4.3 will be removed in 6.0
+ * @param string $group Cache group name.
*
* @return void
*
* @since 1.6
*/
- protected function cleanCache($group = null, $clientId = 0)
+ protected function cleanCache($group = null)
{
parent::cleanCache('com_menus');
parent::cleanCache('com_modules');
diff --git a/administrator/components/com_menus/src/Model/MenusModel.php b/administrator/components/com_menus/src/Model/MenusModel.php
index 374ab7f42a4a5..a6e66f3f77ab4 100644
--- a/administrator/components/com_menus/src/Model/MenusModel.php
+++ b/administrator/components/com_menus/src/Model/MenusModel.php
@@ -84,7 +84,7 @@ public function getItems()
$db = $this->getDatabase();
$menuTypes = array_column((array) $items, 'menutype');
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('m.menutype'),
@@ -153,7 +153,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$clientId = (int) $this->getState('client_id');
// Select all fields from the table.
@@ -231,7 +231,7 @@ public function getModMenuId()
{
$clientId = (int) $this->getState('client_id');
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('e.extension_id'))
->from($db->quoteName('#__extensions', 'e'))
->where(
@@ -287,7 +287,7 @@ public function getMissingModuleLanguages(): array
}
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select($db->quoteName('m.language'))
->from($db->quoteName('#__modules', 'm'))
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 2f9a826a0b0f5..1f3acec65a872 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -14,7 +14,6 @@
use Joomla\CMS\Event\Menu\AfterGetMenuTypeOptionsEvent;
use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
use Joomla\Filesystem\Folder;
@@ -87,7 +86,7 @@ public function getTypeOptions()
// Get the list of components.
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('name'),
@@ -137,7 +136,7 @@ public function getTypeOptions()
* Method to create the reverse lookup for link-to-name.
* (can be used from onAfterGetMenuTypeOptions handlers)
*
- * @param CMSObject $option Object with request array or string and title public variables
+ * @param \stdClass $option Object with request array or string and title public variables
*
* @return void
*
@@ -184,7 +183,7 @@ protected function getTypeOptionsByComponent($component)
* @param string $file File path
* @param string $component Component option as in URL
*
- * @return array|boolean
+ * @return \stdClass|boolean
*
* @since 1.6
*/
@@ -207,7 +206,7 @@ protected function getTypeOptionsFromXml($file, $component)
// If we have no options to parse, just add the base component to the list of options.
if (!empty($menu['options']) && $menu['options'] == 'none') {
// Create the menu option for the component.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = (string) $menu['name'];
$o->description = (string) $menu['msg'];
$o->request = ['option' => $component];
@@ -233,7 +232,7 @@ protected function getTypeOptionsFromXml($file, $component)
foreach ($children as $child) {
if ($child->getName() == 'option') {
// Create the menu option for the component.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = (string) $child['name'];
$o->description = (string) $child['msg'];
$o->request = ['option' => $component, (string) $optionsNode['var'] => (string) $child['value']];
@@ -241,7 +240,7 @@ protected function getTypeOptionsFromXml($file, $component)
$options[] = $o;
} elseif ($child->getName() == 'default') {
// Create the menu option for the component.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = (string) $child['name'];
$o->description = (string) $child['msg'];
$o->request = ['option' => $component];
@@ -258,7 +257,7 @@ protected function getTypeOptionsFromXml($file, $component)
*
* @param string $component Component option like in URLs
*
- * @return array|boolean
+ * @return \stdClass[]|boolean
*
* @since 1.6
*/
@@ -307,7 +306,7 @@ protected function getTypeOptionsFromMvc($component)
foreach ($children as $child) {
if ($child->getName() == 'option') {
// Create the menu option for the component.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = (string) $child['name'];
$o->description = (string) $child['msg'];
$o->request = ['option' => $component, 'view' => $view, (string) $optionsNode['var'] => (string) $child['value']];
@@ -315,7 +314,7 @@ protected function getTypeOptionsFromMvc($component)
$options[] = $o;
} elseif ($child->getName() == 'default') {
// Create the menu option for the component.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = (string) $child['name'];
$o->description = (string) $child['msg'];
$o->request = ['option' => $component, 'view' => $view];
@@ -345,7 +344,7 @@ protected function getTypeOptionsFromMvc($component)
*
* @param string $component Component option like in URLs
*
- * @return array|boolean
+ * @return \stdClass[]|boolean
*
* @since 3.7.0
*/
@@ -419,7 +418,7 @@ protected function getTypeOptionsFromManifest($component)
return \strlen($value);
});
- $options[] = new CMSObject($o);
+ $options[] = $o;
// Do not repeat the default view link (index.php?option=com_abc).
if (\count($o->request) == 1) {
@@ -428,7 +427,7 @@ protected function getTypeOptionsFromManifest($component)
}
if ($ro) {
- $options[] = new CMSObject($ro);
+ $options[] = $ro;
}
return $options;
@@ -440,7 +439,7 @@ protected function getTypeOptionsFromManifest($component)
* @param string $component Component option as in URLs
* @param string $view Name of the view
*
- * @return array
+ * @return \stdClass[]
*
* @since 1.6
*/
@@ -516,7 +515,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
$layout = basename($layout, '.xml');
// Create the menu option for the layout.
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = ucfirst($layout);
$o->description = '';
$o->request = ['option' => $component, 'view' => $view];
diff --git a/administrator/components/com_menus/src/Service/HTML/Menus.php b/administrator/components/com_menus/src/Service/HTML/Menus.php
index 081f6bce55368..4aa3fe7fe9308 100644
--- a/administrator/components/com_menus/src/Service/HTML/Menus.php
+++ b/administrator/components/com_menus/src/Service/HTML/Menus.php
@@ -52,7 +52,7 @@ public function association($itemid)
if ($associations = MenusHelper::getAssociations($itemid)) {
// Get the associated menu items
$db = Factory::getDbo();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select(
[
$db->quoteName('m.id'),
diff --git a/administrator/components/com_menus/src/Table/MenuTable.php b/administrator/components/com_menus/src/Table/MenuTable.php
index 8d4153e514fb2..2056d07e03694 100644
--- a/administrator/components/com_menus/src/Table/MenuTable.php
+++ b/administrator/components/com_menus/src/Table/MenuTable.php
@@ -42,7 +42,7 @@ public function delete($pk = null, $children = false)
if ($return) {
// Delete key from the #__modules_menu table
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__modules_menu'))
->where($db->quoteName('menuid') . ' = :pk')
->bind(':pk', $pk, ParameterType::INTEGER);
diff --git a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
index 7061caabc73b6..dae25d49a82d9 100644
--- a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
@@ -13,7 +13,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Menus\Administrator\Model\MenutypesModel;
@@ -39,7 +38,7 @@ class HtmlView extends BaseHtmlView
/**
* Array of menu types
*
- * @var CMSObject[]
+ * @var \stdClass[]
*
* @since 3.7.0
*/
@@ -140,28 +139,28 @@ protected function addCustomTypes(&$types)
// Adding System Links
$list = [];
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = 'COM_MENUS_TYPE_EXTERNAL_URL';
$o->type = 'url';
$o->description = 'COM_MENUS_TYPE_EXTERNAL_URL_DESC';
$o->request = null;
$list[] = $o;
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = 'COM_MENUS_TYPE_ALIAS';
$o->type = 'alias';
$o->description = 'COM_MENUS_TYPE_ALIAS_DESC';
$o->request = null;
$list[] = $o;
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = 'COM_MENUS_TYPE_SEPARATOR';
$o->type = 'separator';
$o->description = 'COM_MENUS_TYPE_SEPARATOR_DESC';
$o->request = null;
$list[] = $o;
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = 'COM_MENUS_TYPE_HEADING';
$o->type = 'heading';
$o->description = 'COM_MENUS_TYPE_HEADING_DESC';
@@ -169,7 +168,7 @@ protected function addCustomTypes(&$types)
$list[] = $o;
if ($this->state->get('client_id') == 1) {
- $o = new CMSObject();
+ $o = new \stdClass();
$o->title = 'COM_MENUS_TYPE_CONTAINER';
$o->type = 'container';
$o->description = 'COM_MENUS_TYPE_CONTAINER_DESC';
diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php
index 939460035fdcb..2f34f01f5f29e 100644
--- a/administrator/components/com_messages/src/Field/UserMessagesField.php
+++ b/administrator/components/com_messages/src/Field/UserMessagesField.php
@@ -44,7 +44,7 @@ protected function getGroups()
{
// Compute usergroups
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select('id')
->from('#__usergroups');
$db->setQuery($query);
diff --git a/administrator/components/com_messages/src/Model/ConfigModel.php b/administrator/components/com_messages/src/Model/ConfigModel.php
index 4153c5fe9993f..d820d61d3bea7 100644
--- a/administrator/components/com_messages/src/Model/ConfigModel.php
+++ b/administrator/components/com_messages/src/Model/ConfigModel.php
@@ -12,8 +12,8 @@
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\MVC\Model\FormModel;
-use Joomla\CMS\Object\CMSObject;
use Joomla\Database\ParameterType;
+use Joomla\Registry\Registry;
// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
@@ -53,17 +53,17 @@ protected function populateState()
/**
* Method to get a single record.
*
- * @return mixed Object on success, false on failure.
+ * @return \stdClass|false Object on success, false on failure.
*
* @since 1.6
*/
public function getItem()
{
- $item = new CMSObject();
+ $item = new Registry();
$userid = (int) $this->getState('user.id');
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$query->select(
[
$db->quoteName('cfg_name'),
@@ -130,7 +130,7 @@ public function save($data)
$db = $this->getDatabase();
if ($userId = (int) $this->getState('user.id')) {
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__messages_cfg'))
->where($db->quoteName('user_id') . ' = :userid')
->bind(':userid', $userId, ParameterType::INTEGER);
@@ -145,7 +145,7 @@ public function save($data)
}
if (\count($data)) {
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->insert($db->quoteName('#__messages_cfg'))
->columns(
[
diff --git a/administrator/components/com_messages/src/Model/MessageModel.php b/administrator/components/com_messages/src/Model/MessageModel.php
index dd32322376d2b..c93b257696673 100644
--- a/administrator/components/com_messages/src/Model/MessageModel.php
+++ b/administrator/components/com_messages/src/Model/MessageModel.php
@@ -22,7 +22,6 @@
use Joomla\CMS\MVC\Model\AdminModel;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Table\Asset;
-use Joomla\CMS\Table\Table;
use Joomla\CMS\User\User;
use Joomla\CMS\User\UserFactoryAwareInterface;
use Joomla\CMS\User\UserFactoryAwareTrait;
@@ -144,7 +143,7 @@ public function getItem($pk = null)
if ($replyId = (int) $this->getState('reply.id')) {
// If replying to a message, preload some data.
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName(['subject', 'user_id_from', 'user_id_to']))
->from($db->quoteName('#__messages'))
->where($db->quoteName('message_id') . ' = :messageid')
@@ -164,11 +163,12 @@ public function getItem($pk = null)
return false;
}
- $this->item->set('user_id_to', $message->user_id_from);
+ $this->item->user_id_to = $message->user_id_from;
+
$re = Text::_('COM_MESSAGES_RE');
if (stripos($message->subject, $re) !== 0) {
- $this->item->set('subject', $re . ' ' . $message->subject);
+ $this->item->subject = $re . ' ' . $message->subject;
}
}
} elseif ($this->item->user_id_to != $this->getCurrentUser()->id) {
@@ -178,7 +178,7 @@ public function getItem($pk = null)
} else {
// Mark message read
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->update($db->quoteName('#__messages'))
->set($db->quoteName('state') . ' = 1')
->where($db->quoteName('message_id') . ' = :messageid')
@@ -189,7 +189,7 @@ public function getItem($pk = null)
// Get the user name for an existing message.
if ($this->item->user_id_from && $fromUser = new User($this->item->user_id_from)) {
- $this->item->set('from_user_name', $fromUser->name);
+ $this->item->from_user_name = $fromUser->name;
}
}
@@ -430,8 +430,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null)
$db = $this->getDatabase();
try {
- /** @var Asset $table */
- $table = Table::getInstance('Asset');
+ $table = new Asset($db);
$rootId = $table->getRootId();
/** @var Rule[] $rules */
@@ -458,7 +457,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null)
return false;
}
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName('map.user_id'))
->from($db->quoteName('#__user_usergroup_map', 'map'))
->join(
diff --git a/administrator/components/com_messages/src/Model/MessagesModel.php b/administrator/components/com_messages/src/Model/MessagesModel.php
index 76dacc7e90503..2479d3497d13b 100644
--- a/administrator/components/com_messages/src/Model/MessagesModel.php
+++ b/administrator/components/com_messages/src/Model/MessagesModel.php
@@ -108,7 +108,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
- $query = $db->getQuery(true);
+ $query = $db->createQuery();
$user = $this->getCurrentUser();
$id = (int) $user->id;
@@ -179,7 +179,7 @@ protected function getListQuery()
public function purge(int $userId): void
{
$db = $this->getDatabase();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->select($db->quoteName(['cfg_name', 'cfg_value']))
->from($db->quoteName('#__messages_cfg'))
->where(
@@ -206,7 +206,7 @@ public function purge(int $userId): void
// Purge old messages at day set in message configuration
$past = Factory::getDate(time() - $purge * 86400)->toSql();
- $query = $db->getQuery(true)
+ $query = $db->createQuery()
->delete($db->quoteName('#__messages'))
->where(
[
diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php
index abb53a485e360..4038881172b18 100644
--- a/administrator/components/com_messages/src/View/Config/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Config/HtmlView.php
@@ -70,6 +70,10 @@ public function display($tpl = null)
// Bind the record to the form.
$this->form->bind($this->item);
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '');
+
$this->addToolbar();
parent::display($tpl);
diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php
index cb75bb39d2d5b..f24cc1691c612 100644
--- a/administrator/components/com_messages/src/View/Message/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Message/HtmlView.php
@@ -76,6 +76,10 @@ public function display($tpl = null)
throw new GenericDataException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
}
+ // Add form control fields
+ $this->form
+ ->addControlField('task', '');
+
parent::display($tpl);
$this->addToolbar();
}
diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php
index 5e897d6d3c430..60d8fa21fbec5 100644
--- a/administrator/components/com_messages/src/View/Messages/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php
@@ -98,6 +98,11 @@ public function display($tpl = null)
$this->setLayout('emptystate');
}
+ // Add form control fields
+ $this->filterForm
+ ->addControlField('task', '')
+ ->addControlField('boxchecked', '0');
+
$this->addToolbar();
parent::display($tpl);
diff --git a/administrator/components/com_messages/tmpl/config/default.php b/administrator/components/com_messages/tmpl/config/default.php
index a366045716225..9cdf2f65105a9 100644
--- a/administrator/components/com_messages/tmpl/config/default.php
+++ b/administrator/components/com_messages/tmpl/config/default.php
@@ -10,7 +10,6 @@
defined('_JEXEC') or die;
-use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;
@@ -36,6 +35,5 @@
-
-
- item->get('from_user_name'); ?> +
- item->from_user_name; ?>
- item->date_time, Text::_('DATE_FORMAT_LC2')); ?> diff --git a/administrator/components/com_messages/tmpl/message/edit.php b/administrator/components/com_messages/tmpl/message/edit.php index ac0fe33e81b54..35ef50855f078 100644 --- a/administrator/components/com_messages/tmpl/message/edit.php +++ b/administrator/components/com_messages/tmpl/message/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -41,6 +40,6 @@
-
-
-
-
+
+ filterForm->renderControlFields(); ?>
![\"The](\"media/com_guidedtours/images/5_2/enhancedtourheader.png\")
![\"Mail](\"media/com_guidedtours/images/5_2/mailtemplate.png\")
![\"The](\"media/com_guidedtours/images/5_3/filesdirectory.jpg\")
![\"Display](\"media/com_guidedtours/images/5_4/automated-updates.jpg\")
![\"Display](\"media/com_guidedtours/images/6_0/cassiopeiacolors.jpg\")