diff --git a/.drone.yml b/.drone.yml index 8b15c95c4d2f0..076b5064f8977 100644 --- a/.drone.yml +++ b/.drone.yml @@ -182,19 +182,20 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql - - name: phpnext-api-mysql - depends_on: - - phpmin-api-mysql - image: joomlaprojects/docker-images:systemtests8.2 - failure: ignore - environment: - JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - commands: - - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext +# - name: phpnext-api-mysql +# depends_on: +# - phpmin-api-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext - name: phpmin-api-postgres depends_on: - - phpnext-api-mysql + # - phpnext-api-mysql + - phpmin-api-mysql image: joomlaprojects/docker-images:systemtests failure: ignore environment: @@ -202,19 +203,20 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres - - name: phpnext-api-postgres - depends_on: - - phpmin-api-postgres - image: joomlaprojects/docker-images:systemtests8.2 - failure: ignore - environment: - JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - commands: - - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext +# - name: phpnext-api-postgres +# depends_on: +# - phpmin-api-postgres +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext - name: phpmax-api-postgres depends_on: - - phpnext-api-postgres +# - phpnext-api-postgres + - phpmin-api-postgres image: joomlaprojects/docker-images:systemtests8.1 failure: ignore environment: @@ -233,17 +235,20 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql - - name: phpnext-system-mysql - depends_on: [ phpmin-system-mysql ] - image: joomlaprojects/docker-images:systemtests8.2 - failure: ignore - environment: - JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - commands: - - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext +# - name: phpnext-system-mysql +# depends_on: +# - phpmin-system-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext - name: phpmax-system-mysql - depends_on: [ phpnext-system-mysql ] + depends_on: +# - phpnext-system-mysql + - phpmin-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore environment: @@ -251,17 +256,20 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax - - name: phpnext-system-mysql8 - depends_on: [ phpmax-system-mysql ] - image: joomlaprojects/docker-images:systemtests8.2 - failure: ignore - environment: - JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - commands: - - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext +# - name: phpnext-system-mysql8 +# depends_on: +# - phpmax-system-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext - name: phpmax-system-mysql8 - depends_on: [ phpnext-system-mysql ] + depends_on: +# - phpnext-system-mysql + - phpmax-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore environment: @@ -269,17 +277,20 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax - - name: phpnext-system-postgres - depends_on: [ phpmax-system-mysql8 ] - image: joomlaprojects/docker-images:systemtests8.2 - failure: ignore - environment: - JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - commands: - - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext +# - name: phpnext-system-postgres +# depends_on: +# - phpmax-system-mysql8 +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext - name: phpmax-system-postgres - depends_on: [ phpnext-system-mysql8 ] + depends_on: +# - phpnext-system-mysql8 + - phpmax-system-mysql8 image: joomlaprojects/docker-images:systemtests8.1 failure: ignore environment: @@ -306,17 +317,17 @@ steps: - name: artifacts-system-tests image: cschlosser/drone-ftps depends_on: - - phpnext-system-mysql - - phpnext-system-mysql8 - - phpnext-system-postgres +# - phpnext-system-mysql +# - phpnext-system-mysql8 +# - phpnext-system-postgres - phpmax-system-mysql - phpmax-system-mysql8 - phpmax-system-postgres - phpmin-system-mysql - phpmin-system-mysql8 - phpmin-system-postgres - - phpnext-api-mysql - - phpnext-api-postgres +# - phpnext-api-mysql +# - phpnext-api-postgres - phpmax-api-mysql - phpmax-api-postgres - phpmin-api-mysql @@ -409,6 +420,6 @@ steps: --- kind: signature -hmac: e93522732dd8607448fa7705982c42c06f9ebf9762023ed1bb2207ee975fee42 +hmac: daa8e5588cc88058bc57aadf35e3d9dd55eefaa9419c457ce374a0dd19eb7cda ... diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php index 9ced66d6e8f80..9f8bf37655e08 100644 --- a/administrator/components/com_content/src/Model/ArticleModel.php +++ b/administrator/components/com_content/src/Model/ArticleModel.php @@ -416,7 +416,7 @@ public function getItem($pk = null) $registry = new Registry($item->urls); $item->urls = $registry->toArray(); - $item->articletext = trim($item->fulltext) != '' ? $item->introtext . "
" . $item->fulltext : $item->introtext; + $item->articletext = ($item->fulltext !== null && trim($item->fulltext) != '') ? $item->introtext . "
" . $item->fulltext : $item->introtext; if (!empty($item->id)) { diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php index 0ab57cfb8e8c5..6ad10b9842ce1 100644 --- a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php +++ b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php @@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView public function display($tpl = null) { $app = Factory::getApplication(); - $dashboard = $app->input->getCmd('dashboard'); + $dashboard = $app->input->getCmd('dashboard', ''); $position = ApplicationHelper::stringURLSafe($dashboard); diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php index 549206777f89d..c59dc7b01625f 100644 --- a/administrator/components/com_joomlaupdate/extract.php +++ b/administrator/components/com_joomlaupdate/extract.php @@ -525,7 +525,7 @@ public function enforceMinimumExecutionTime() return; } - $sleepMillisec = $minExecTime - $elapsed; + $sleepMillisec = intval($minExecTime - $elapsed); /** * If we need to sleep for more than 1 second we should be using sleep() or time_sleep_until() to prevent high diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 4d171af9c3512..f116aa9e65063 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -296,6 +296,12 @@ protected function addToolbar() */ public function shouldDisplayPreUpdateCheck() { + // When the download URL is not found there is no core upgrade path + if (!isset($this->updateInfo['object']->downloadurl->_data)) + { + return false; + } + $nextMinor = Version::MAJOR_VERSION . '.' . (Version::MINOR_VERSION + 1); // Show only when we found a download URL, we have an update and when we update to the next minor or greater. diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 2f7563e5ee92b..8f2c38d228ba4 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -55,6 +55,32 @@ public function registerProvider(ProviderInterface $provider) $this->providers[$provider->getID()] = $provider; } + /** + * Unregister a provider from the ProviderManager. + * When no provider, or null is passed in, then all providers are cleared. + * + * @param ProviderInterface|null $provider The provider to be unregistered + * + * @return void + * + * @since 4.0.6 + */ + public function unregisterProvider(ProviderInterface $provider = null): void + { + if ($provider === null) + { + $this->providers = []; + return; + } + + if (!array_key_exists($provider->getID(), $this->providers)) + { + return; + } + + unset($this->providers[$provider->getID()]); + } + /** * Returns the provider for a particular ID * diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index b2dd8d7fabb0a..b4502450d0ce1 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -121,7 +121,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Reinstall Joomla core files" COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla version" COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Update" COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Latest Joomla version" -COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL" +COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="Update unavailable" COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.
Please try to download the update package from the official Joomla download page and use the Upload and Update tab." COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="A new version of the Joomla Update Component is available." COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="You must update this component first before you can update Joomla! Click here to update the component." diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini index 4cebf64ed4ef4..2fe27310d9012 100644 --- a/administrator/language/en-GB/lib_joomla.ini +++ b/administrator/language/en-GB/lib_joomla.ini @@ -649,6 +649,10 @@ JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users." JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for the user." JLIB_INSTALLER_PURGED_UPDATES="Cleared updates." +JLIB_INSTALLER_SQL_BEGIN="Start of SQL updates." +JLIB_INSTALLER_SQL_BEGIN_SCHEMA="The current database version (schema) is %s." +JLIB_INSTALLER_SQL_END="End of SQL updates." +JLIB_INSTALLER_SQL_END_NOT_COMPLETE="End of SQL updates - INCOMPLETE." JLIB_INSTALLER_UNINSTALL="Uninstall" JLIB_INSTALLER_UPDATE="Update" JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s." diff --git a/administrator/modules/mod_latest/src/Helper/LatestHelper.php b/administrator/modules/mod_latest/src/Helper/LatestHelper.php index 4063ed752c04f..5353913a538db 100644 --- a/administrator/modules/mod_latest/src/Helper/LatestHelper.php +++ b/administrator/modules/mod_latest/src/Helper/LatestHelper.php @@ -96,7 +96,8 @@ public static function getList(Registry &$params, ArticlesModel $model) { $item->link = ''; - if ($user->authorise('core.edit', 'com_content.article.' . $item->id)) + if ($user->authorise('core.edit', 'com_content.article.' . $item->id) + || ($user->authorise('core.edit.own', 'com_content.article.' . $item->id) && ($userId === $item->created_by))) { $item->link = Route::_('index.php?option=com_content&task=article.edit&id=' . $item->id); } diff --git a/administrator/modules/mod_popular/src/Helper/PopularHelper.php b/administrator/modules/mod_popular/src/Helper/PopularHelper.php index 83d9fd226c424..1572b9b821013 100644 --- a/administrator/modules/mod_popular/src/Helper/PopularHelper.php +++ b/administrator/modules/mod_popular/src/Helper/PopularHelper.php @@ -87,7 +87,8 @@ public static function getList(Registry &$params, ArticlesModel $model) { $item->link = ''; - if ($user->authorise('core.edit', 'com_content.article.' . $item->id)) + if ($user->authorise('core.edit', 'com_content.article.' . $item->id) + || ($user->authorise('core.edit.own', 'com_content.article.' . $item->id) && ($userId === $item->created_by))) { $item->link = Route::_('index.php?option=com_content&task=article.edit&id=' . $item->id); } diff --git a/api/components/com_categories/src/Controller/CategoriesController.php b/api/components/com_categories/src/Controller/CategoriesController.php index 7dfb0cdafabe3..e0c7b8d29ded1 100644 --- a/api/components/com_categories/src/Controller/CategoriesController.php +++ b/api/components/com_categories/src/Controller/CategoriesController.php @@ -51,7 +51,7 @@ protected function preprocessSaveData(array $data): array $extension = $this->getExtensionFromInput(); $data['extension'] = $extension; - // @todo: This is a hack to drop the extension into the global input object - to satisfy how state is built + // TODO: This is a hack to drop the extension into the global input object - to satisfy how state is built // we should be able to improve this in the future $this->input->set('extension', $extension); @@ -65,7 +65,7 @@ protected function preprocessSaveData(array $data): array * * @return integer The record ID on success, false on failure * - * @since 4.1.0 + * @since 4.0.6 */ protected function save($recordKey = null) { diff --git a/build/stubGenerator.php b/build/stubGenerator.php index d93b8d2f2d6de..f4b899cdece1a 100644 --- a/build/stubGenerator.php +++ b/build/stubGenerator.php @@ -61,6 +61,7 @@ class StubGenerator extends CliApplication public function doExecute() { $this->createExtensionNamespaceMap(); + $contentsByNamespace = []; $file = "isInterface() && $reflection->isFinal()) ? 'final ' : ''; $modifier = ($reflection->isAbstract() && !$reflection->isInterface()) ? $modifier . 'abstract ' : $modifier; + $namespaceSegments = explode('\\', $oldName); + $className = array_pop($namespaceSegments); + $targetNamespace = ltrim(implode('\\', $namespaceSegments), '\\'); + // If a deprecated version is available, write a stub class doc block with a deprecated tag if ($deprecatedVersion !== false) { - $file .= << $contents) + { + $file .= "namespace $namespace {\n"; + $file .= $contents; + $file .= "}\n\n"; } // And save the file locally diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php index 02bbbd0d48aa8..b8936a325f095 100644 --- a/components/com_contact/tmpl/category/default_items.php +++ b/components/com_contact/tmpl/category/default_items.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use Joomla\Component\Contact\Administrator\Helper\ContactHelper; @@ -99,7 +100,14 @@ class="inputbox" onchange="document.adminForm.submit();" params->get('show_image_heading')) : ?> image) : ?> - image, '', array('class' => 'contact-thumbnail img-thumbnail')); ?> + $item->image, + 'alt' => '', + 'class' => 'contact-thumbnail img-thumbnail', + ] + ); ?> escape($item->name); ?> diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php index 0299548b3421e..24d326583bdbe 100644 --- a/components/com_contact/tmpl/contact/default.php +++ b/components/com_contact/tmpl/contact/default.php @@ -14,6 +14,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Router\Route; use Joomla\Component\Contact\Site\Helper\RouteHelper; @@ -97,11 +98,13 @@ item->image && $tparams->get('show_image')) : ?>
- item->image, - htmlspecialchars($this->item->name, ENT_QUOTES, 'UTF-8'), - array('itemprop' => 'image') + $this->item->image, + 'alt' => $this->item->name, + 'itemprop' => 'image', + ] ); ?>
diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php index 5456cf33e9d61..cd6d656572c82 100644 --- a/components/com_content/tmpl/category/blog.php +++ b/components/com_content/tmpl/category/blog.php @@ -13,6 +13,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; $app = Factory::getApplication(); @@ -54,8 +55,13 @@ params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
params->get('show_description_image') && $this->category->getParams()->get('image')) : ?> - category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? '' : 'alt="' . htmlspecialchars($this->category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8') . '"'; ?> - > + $this->category->getParams()->get('image'), + 'alt' => empty($this->category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? false : $this->category->getParams()->get('image_alt'), + ] + ); ?> params->get('show_description') && $this->category->description) : ?> @@ -78,12 +84,11 @@ lead_items)) : ?>
lead_items as &$item) : ?> -
- item = & $item; - echo $this->loadTemplate('item'); - ?> +
+ item = &$item; + echo $this->loadTemplate('item'); + ?>
diff --git a/components/com_newsfeeds/tmpl/category/default.php b/components/com_newsfeeds/tmpl/category/default.php index 0f50849fb0426..12ce5fafcdcb7 100644 --- a/components/com_newsfeeds/tmpl/category/default.php +++ b/components/com_newsfeeds/tmpl/category/default.php @@ -12,9 +12,9 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; -$pageClass = $this->params->get('pageclass_sfx'); -$htag = $this->params->get('show_page_heading') ? 'h2' : 'h1'; +$htag = $this->params->get('show_page_heading') ? 'h2' : 'h1'; ?>
params->get('show_page_heading')) : ?> @@ -34,7 +34,13 @@ params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
params->get('show_description_image') && $this->category->getParams()->get('image')) : ?> - + $this->category->getParams()->get('image'), + 'alt' => empty($this->category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? false : $this->category->getParams()->get('image_alt'), + ] + ); ?> params->get('show_description') && $this->category->description) : ?> category->description, '', 'com_newsfeeds.category'); ?> diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php index 3a4abedc08fae..99cf1315060ea 100644 --- a/components/com_newsfeeds/tmpl/newsfeed/default.php +++ b/components/com_newsfeeds/tmpl/newsfeed/default.php @@ -14,6 +14,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; ?> @@ -61,30 +62,37 @@ image_first) && !empty($images->image_first)) : ?> float_first) ? $this->params->get('float_first') : $images->float_first; ?> - image_first_alt) && empty($images->image_first_alt_empty) - ? '' - : 'alt="' . htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> - -
- image_first_caption) : ?> - image_first_caption, ENT_COMPAT, 'UTF-8') . '"'; ?> - - src="image_first, ENT_COMPAT, 'UTF-8'); ?>" > +
+
+ $images->image_first, + 'alt' => empty($images->image_first_alt) && empty($images->image_first_alt_empty) ? false : $images->image_first_alt, + ] + ); ?> + image_first_caption) : ?> +
escape($images->image_first_caption); ?>
+ +
image_second) and !empty($images->image_second)) : ?> float_second) ? $this->params->get('float_second') : $images->float_second; ?> - image_second_alt) && empty($images->image_second_alt_empty) - ? '' - : 'alt="' . htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> -
- image_second_caption) : ?> - image_second_caption) . '"'; ?> - - src="image_second, ENT_COMPAT, 'UTF-8'); ?>" > +
+
+ $images->image_second, + 'alt' => empty($images->image_second_alt) && empty($images->image_second_alt_empty) ? false : $images->image_second_alt, + ] + ); ?> + image_second_caption) : ?> +
escape($images->image_second_caption); ?>
+ +
@@ -98,9 +106,15 @@ - rssDoc->image && $this->params->get('show_feed_image')) : ?> + rssDoc->image && $this->params->get('show_feed_image')) : ?>
- <?php echo $this->rssDoc->image->title; ?> + $this->rssDoc->image->uri, + 'alt' => $this->rssDoc->image->title, + ] + ); ?>
diff --git a/components/com_privacy/forms/confirm.xml b/components/com_privacy/forms/confirm.xml index 6113c06056b4d..cd0f65a335f0d 100644 --- a/components/com_privacy/forms/confirm.xml +++ b/components/com_privacy/forms/confirm.xml @@ -1,16 +1,6 @@
- -
- - input->get('view', $this->default_view); - // Submitting information requests through the frontend is restricted to authenticated users at this time - if ($view === 'request' && $this->app->getIdentity()->guest) + // Submitting information requests and confirmation through the frontend is restricted to authenticated users at this time + if (in_array($view, ['confirm', 'request']) && $this->app->getIdentity()->guest) { $this->setRedirect( - Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=request'), false) + Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=' . $view), false) ); return $this; @@ -49,7 +48,7 @@ public function display($cachable = false, $urlparams = []) // Set a Referrer-Policy header for views which require it if (in_array($view, ['confirm', 'remind'])) { - Factory::getApplication()->setHeader('Referrer-Policy', 'no-referrer', true); + $this->app->setHeader('Referrer-Policy', 'no-referrer', true); } return parent::display($cachable, $urlparams); diff --git a/components/com_privacy/src/Model/ConfirmModel.php b/components/com_privacy/src/Model/ConfirmModel.php index bbb06ae039ff2..081a8d04c94f6 100644 --- a/components/com_privacy/src/Model/ConfirmModel.php +++ b/components/com_privacy/src/Model/ConfirmModel.php @@ -44,7 +44,6 @@ public function confirmRequest($data) { // Get the form. $form = $this->getForm(); - $data['email'] = PunycodeHelper::emailToPunycode($data['email']); // Check for an error. if ($form instanceof \Exception) @@ -74,11 +73,14 @@ public function confirmRequest($data) return false; } + // Get the user email address + $email = Factory::getUser()->email; + // Search for the information request /** @var RequestTable $table */ $table = $this->getTable(); - if (!$table->load(['email' => $data['email'], 'status' => 0])) + if (!$table->load(['email' => $email, 'status' => 0])) { $this->setError(Text::_('COM_PRIVACY_ERROR_NO_PENDING_REQUESTS')); diff --git a/components/com_privacy/src/Model/RequestModel.php b/components/com_privacy/src/Model/RequestModel.php index ee58cbca9ac66..f4ace4539f44b 100644 --- a/components/com_privacy/src/Model/RequestModel.php +++ b/components/com_privacy/src/Model/RequestModel.php @@ -58,8 +58,7 @@ public function createRequest($data) } // Get the form. - $form = $this->getForm(); - $data['email'] = PunycodeHelper::emailToPunycode($data['email']); + $form = $this->getForm(); // Check for an error. if ($form instanceof \Exception) @@ -89,6 +88,8 @@ public function createRequest($data) return false; } + $email = Factory::getUser()->email; + // Search for an open information request matching the email and type $db = $this->getDbo(); $query = $db->getQuery(true) @@ -97,7 +98,7 @@ public function createRequest($data) ->where($db->quoteName('email') . ' = :email') ->where($db->quoteName('request_type') . ' = :requesttype') ->whereIn($db->quoteName('status'), [0, 1]) - ->bind(':email', $data['email']) + ->bind(':email', $email) ->bind(':requesttype', $data['request_type']); try @@ -138,7 +139,7 @@ public function createRequest($data) $messageModel->notifySuperUsers( Text::_('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_SUBJECT'), - Text::sprintf('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_MESSAGE', $data['email']) + Text::sprintf('COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_MESSAGE', $email) ); // The mailer can be set to either throw Exceptions or return boolean false, account for both @@ -173,7 +174,7 @@ public function createRequest($data) } $mailer->addTemplateData($templateData); - $mailer->addRecipient($data['email']); + $mailer->addRecipient($email); $mailer->send(); diff --git a/composer.json b/composer.json index 2372bef549a56..e8f9bec8515f8 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,10 @@ "php": "7.2.5" }, "vendor-dir": "libraries/vendor", - "github-protocols": ["https"] + "github-protocols": ["https"], + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "support": { "issues": "https://issues.joomla.org/", @@ -22,6 +25,13 @@ "forum": "https://forum.joomla.org/", "docs": "https://docs.joomla.org/" }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/joomla-backports/json-api-php.git", + "no-api": true + } + ], "autoload": { "psr-4": { "Joomla\\CMS\\": "libraries/src/" @@ -62,7 +72,7 @@ "fig/link-util": "~1.0", "google/recaptcha": "~1.1", "laminas/laminas-diactoros": "^2.2.2", - "paragonie/sodium_compat": "~1.9.1", + "paragonie/sodium_compat": "~1.17.0", "phpmailer/phpmailer": "~6.0", "psr/link": "~1.0", "symfony/console": "~5.0", @@ -75,7 +85,7 @@ "typo3/phar-stream-wrapper": "~3.1", "wamania/php-stemmer": "^2.0", "maximebf/debugbar": "^1.17", - "tobscure/json-api": "^0.4.1", + "tobscure/json-api": "dev-joomla-backports", "willdurand/negotiation": "^3.0", "ext-json": "*", "ext-simplexml": "*", diff --git a/composer.lock b/composer.lock index a2e71de9fb20a..530979ca39c03 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "db21cea46c4cc20e603e4711a8045f5c", + "content-hash": "1bc051f8327d43f2ea9ff9aca3cccef3", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -2522,16 +2522,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.9.4", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "91c1362bb0084c02828d43bbc9ee38831297329e" + "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/91c1362bb0084c02828d43bbc9ee38831297329e", - "reference": "91c1362bb0084c02828d43bbc9ee38831297329e", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321", + "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321", "shasum": "" }, "require": { @@ -2539,7 +2539,7 @@ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8" }, "require-dev": { - "phpunit/phpunit": "^3|^4|^5" + "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9" }, "suggest": { "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.", @@ -2602,9 +2602,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/master" + "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0" }, - "time": "2019-05-09T23:30:36+00:00" + "time": "2021-08-10T02:43:50+00:00" }, { "name": "php-http/message-factory", @@ -4734,16 +4734,16 @@ }, { "name": "tobscure/json-api", - "version": "v0.4.1", + "version": "dev-joomla-backports", "source": { "type": "git", - "url": "https://github.com/tobscure/json-api.git", - "reference": "d4ba8437977c33a5189d95d9ffa751997f13b104" + "url": "https://github.com/joomla-backports/json-api-php.git", + "reference": "e2ad4287b17cc2872d75c85857306371f3de5514" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tobscure/json-api/zipball/d4ba8437977c33a5189d95d9ffa751997f13b104", - "reference": "d4ba8437977c33a5189d95d9ffa751997f13b104", + "url": "https://api.github.com/repos/joomla-backports/json-api-php/zipball/e2ad4287b17cc2872d75c85857306371f3de5514", + "reference": "e2ad4287b17cc2872d75c85857306371f3de5514", "shasum": "" }, "require": { @@ -4780,11 +4780,7 @@ "jsonapi", "standard" ], - "support": { - "issues": "https://github.com/tobscure/json-api/issues", - "source": "https://github.com/tobscure/json-api/tree/v0.4.1" - }, - "time": "2017-03-05T21:16:24+00:00" + "time": "2022-01-08T20:57:18+00:00" }, { "name": "typo3/phar-stream-wrapper", @@ -4823,7 +4819,11 @@ "TYPO3\\PharStreamWrapper\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Tobscure\\Tests\\JsonApi\\": "tests/" + } + }, "license": [ "MIT" ], @@ -10591,6 +10591,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "tobscure/json-api": 20, "joomla/cms-coding-standards": 20, "joomla/coding-standards": 20, "joomla-projects/joomla-browser": 20 diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml index 3e4fa008d13db..c59e7c1681123 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,8 +1,8 @@ Arabic (اللغة العربية) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index a18c98f8359cf..806b8bc9d3559 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,8 +1,8 @@ Czech (Čeština) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Czech Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml index d7f572d45c3b8..6ec905b77a194 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,8 +1,8 @@ Welsh (United Kingdom) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project - Welsh Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml index c47ff308c2187..42e614c5f6287 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,8 +1,8 @@ Danish (Danmark) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml index 50f5e53bda770..8104504dfaaa8 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,8 +1,8 @@ Greek (el-GR) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Ομάδα Μετάφρασης στα Ελληνικά: joomla. gr (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml index 62528d22c8e03..87f8a9362c834 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,8 +1,8 @@ English (Australia) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml index 51411565b88b2..005111acd9af4 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,8 +1,8 @@ English (United States) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml index d889ee77f827e..57185c069f88a 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,8 +1,8 @@ Spanish (Spain) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Spanish [es-ES] Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml index 31919382f77d5..fda2d388c21b9 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,8 +1,8 @@ Estonian - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml index a27e468053354..06a36f61a32db 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,8 +1,8 @@ Basque - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Basque Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml index 2fecf2e8f9554..292498a3cb19c 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,8 +1,8 @@ Persian (پارسی) - 4.0.5 - December 2021 + 4.0.6 + January 2022 JoomlaFarsi.Com Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index 6aef0c7902c02..ce760f28dd38a 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,8 +1,8 @@ French (fr-FR) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index 56bf7fe6f04a2..6245654d1ba45 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,8 +1,8 @@ Hungarian (Magyar) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index cc2d23b8b32d2..cfa089b47e79c 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,8 +1,8 @@ Italiano (it-IT) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Italian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index bffa1493f6e1a..782d8f9a365e7 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,8 +1,8 @@ Japanese (ja-JP) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index b34f322cdd3d8..57ed637d8621b 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,8 +1,8 @@ Georgian (Georgia) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Georgian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml index 8a44d02b6ae73..c1d4f401f91c0 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,8 +1,8 @@ Latvian (Latvia) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Projekts (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 97217f56c1a49..b8395c60db5a7 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (Belgium) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Dutch (BE) translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml index de6a14be54a2f..49ab0dd1a6d68 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (nl-NL) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Dutch Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml index 7af5c1b67689c..5fa04e536a90b 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,8 +1,8 @@ Polish (Poland) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Projekt Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml index a292d0af15841..897d9ffe52b17 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,8 +1,8 @@ Português Brasil (pt-BR) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Projeto Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml index a27e238c9ac44..4e9ad3efb2f63 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,8 +1,8 @@ Português (Portugal) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index c5094da666742..55129599b9a66 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,8 +1,8 @@ Română (România) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Horia Negura - Quanta (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ru-RU/langmetadata.xml b/installation/language/ru-RU/langmetadata.xml index 4c08a2c7d1e3d..5e8d2da38c886 100644 --- a/installation/language/ru-RU/langmetadata.xml +++ b/installation/language/ru-RU/langmetadata.xml @@ -1,8 +1,8 @@ Russian (Russia) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Russian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml index 144052a7061cb..90f7dd1d83e2a 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,8 +1,8 @@ Slovak (Slovakia) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Slovak translation team : Peter Michnica (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml index de9875d5ed020..6d70f4ac56d01 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,8 +1,8 @@ Slovenščina (Slovenija) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Slovenska prevajalska ekipa (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml index 311a26b945f79..111b97b966f6e 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,8 +1,8 @@ Swedish (Sweden) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Swedish Translation Team - SvenskJoomla (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ta-IN/joomla.ini b/installation/language/ta-IN/joomla.ini index bc3e28d88908f..78f75d6dac962 100644 --- a/installation/language/ta-IN/joomla.ini +++ b/installation/language/ta-IN/joomla.ini @@ -234,7 +234,7 @@ JLIB_INSTALLER_INSTALL="நிறுவுக" JLIB_INSTALLER_NOT_ERROR="பிழையானது TinyMCE மொழிக் கோப்புகள் நிறுவல் தொடர்பானது என்றால் இப்பிழை Joomla! மொழி(கள்) நிறுவலுக்கு எந்த விளைவையும் ஏற்படுத்தாது. Joomla 3.2.0-க்கு முன் உருவாக்கப்பட்ட சில மொழித் தொகுப்புகள் TinyMCE மொழிக் கோப்புகளைத் தனியாக நிறுவ முயற்சிக்கலாம். இந்த TinyMCE மொழிக் கோப்புகள் தற்சமயம் Joomla-வில் சேர்க்கப்பட்டிருப்பதால் இவற்றைத் தனியாக நிறுவ வேண்டாம்." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s மொழிக்கு உள்ளடக்க மொழியை (content language) உருவாக்க முடியவில்லை: %s." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="புதுப்பித்தல்: புதுப்பித்தல் தளத்தைத் திறக்க முடியவில்லை #%d \"%s\", இணையமுகவரி: %s" -JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை
joomla.library: %1$s - %2$s" +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை
joomla.library: %1$s - %2$s" ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="மொழிக் கோப்புகளில் அலகிடல்/சொல்லிலக்கணப் பிழைகள்" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="மொழிபெயர்க்கப்படாத எழுத்துச்சரங்கள்" diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml index 9e398b0a6a5ff..7b76553057502 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,8 +1,8 @@ Tamil (India) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Ilagnayeru 'MIG' Manickam, Elango Samy Manim (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml index b894a01a05458..4c6778468dc22 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,8 +1,8 @@ Thai (ภาษาไทย) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Thai Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml index 6a869deb2cc2b..5aef3b656758a 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,8 +1,8 @@ Turkish (Turkey) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Turkey (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index 960eda4fd20ba..5c417207be595 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,8 +1,8 @@ Ukrainian (uk-UA) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! Project - Ukrainian translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index ea875ed5a9343..43159fdcea7ac 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,8 +1,8 @@ 简体中文(中国) - 4.0.5 - December 2021 + 4.0.6 + January 2022 逐浪中文网 joomlachina.org.cn 周永建 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml index 351e4d403ea62..a6899d2df9ad4 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,8 +1,8 @@ 正體中文 (臺灣) - 4.0.5 - December 2021 + 4.0.6 + January 2022 Joomla! 專案 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php index c7f70df589a6b..b7fd721932d40 100644 --- a/installation/src/Application/InstallationApplication.php +++ b/installation/src/Application/InstallationApplication.php @@ -300,13 +300,13 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig') */ private function executeController() { - $task = $this->input->get('task'); + $task = $this->input->getCmd('task', ''); // The name of the controller $controllerName = 'display'; // Parse task in format controller.task - if ($task) + if ($task !== '') { list($controllerName, $task) = explode('.', $task, 2); } diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini index 8cee7dc26824c..d5c98818afc8d 100644 --- a/language/en-GB/lib_joomla.ini +++ b/language/en-GB/lib_joomla.ini @@ -648,6 +648,10 @@ JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users." JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for the user." JLIB_INSTALLER_PURGED_UPDATES="Cleared updates." +JLIB_INSTALLER_SQL_BEGIN="Start of SQL updates." +JLIB_INSTALLER_SQL_BEGIN_SCHEMA="The current database version (schema) is %s." +JLIB_INSTALLER_SQL_END="End of SQL updates." +JLIB_INSTALLER_SQL_END_NOT_COMPLETE="End of SQL updates - INCOMPLETE." JLIB_INSTALLER_UNINSTALL="Uninstall" JLIB_INSTALLER_UPDATE="Update" JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s." diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php index 5ba6d8ea049ec..ad83dbb1cfd7e 100644 --- a/layouts/joomla/content/category_default.php +++ b/layouts/joomla/content/category_default.php @@ -72,8 +72,13 @@ get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
get('show_description_image') && $category->getParams()->get('image')) : ?> - getParams()->get('image_alt')) && empty($category->getParams()->get('image_alt_empty')) ? '' : 'alt="' . htmlspecialchars($category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8') . '"'; ?> - > + $category->getParams()->get('image'), + 'alt' => empty($category->getParams()->get('image_alt')) && empty($category->getParams()->get('image_alt_empty')) ? false : $category->getParams()->get('image_alt'), + ] + ); ?> get('show_description') && $category->description) : ?> diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php index 3ddde77ea0c54..33661fe9b0bb9 100644 --- a/layouts/joomla/content/full_image.php +++ b/layouts/joomla/content/full_image.php @@ -9,8 +9,7 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Layout\LayoutHelper; $params = $displayData->params; $images = json_decode($displayData->images); @@ -20,25 +19,16 @@ return; } -$imgclass = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; -$extraAttr = ''; -$img = HTMLHelper::cleanImageURL($images->image_fulltext); -$alt = empty($images->image_fulltext_alt) && empty($images->image_fulltext_alt_empty) ? '' : 'alt="' . htmlspecialchars($images->image_fulltext_alt, ENT_COMPAT, 'UTF-8') . '"'; - -// Set lazyloading only for images which have width and height attributes -if ((isset($img->attributes['width']) && (int) $img->attributes['width'] > 0) -&& (isset($img->attributes['height']) && (int) $img->attributes['height'] > 0)) -{ - $extraAttr = ArrayHelper::toString($img->attributes) . ' loading="lazy"'; -} +$imgclass = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; +$layoutAttr = [ + 'src' => $images->image_fulltext, + 'itemprop' => 'image', + 'alt' => empty($images->image_fulltext_alt) && empty($images->image_fulltext_alt_empty) ? false : $images->image_fulltext_alt, +]; ?> -
- - itemprop="image" - - /> +
+ image_fulltext_caption !== '') : ?> -
image_fulltext_caption, ENT_COMPAT, 'UTF-8'); ?>
+
escape($images->image_fulltext_caption); ?>
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php index 4ed9166500e2f..9c71886774220 100644 --- a/layouts/joomla/content/intro_image.php +++ b/layouts/joomla/content/intro_image.php @@ -9,10 +9,9 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\Component\Content\Site\Helper\RouteHelper; -use Joomla\Utilities\ArrayHelper; $params = $displayData->params; $images = json_decode($displayData->images); @@ -22,36 +21,21 @@ return; } -$imgclass = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro; -$extraAttr = ''; -$img = HTMLHelper::cleanImageURL($images->image_intro); -$alt = empty($images->image_intro_alt) && empty($images->image_intro_alt_empty) ? '' : 'alt="' . htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8') . '"'; - -// Set lazyloading only for images which have width and height attributes -if ((isset($img->attributes['width']) && (int) $img->attributes['width'] > 0) -&& (isset($img->attributes['height']) && (int) $img->attributes['height'] > 0)) -{ - $extraAttr = ArrayHelper::toString($img->attributes) . ' loading="lazy"'; -} +$imgclass = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro; +$layoutAttr = [ + 'src' => $images->image_intro, + 'alt' => empty($images->image_intro_alt) && empty($images->image_intro_alt_empty) ? false : $images->image_intro_alt, +]; ?> -
+
get('link_intro_image') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?> - - - itemprop="thumbnail" - - /> + 'thumbnail'])); ?> image_intro_caption) && $images->image_intro_caption !== '') : ?> -
image_intro_caption, ENT_COMPAT, 'UTF-8'); ?>
+
escape($images->image_intro_caption); ?>
diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php index d27a259b53eda..3596c9488f9dc 100644 --- a/layouts/joomla/form/field/url.php +++ b/layouts/joomla/form/field/url.php @@ -62,6 +62,12 @@ $required ? ' required' : '', $dataAttribute, ); + +// @deprecated 5.0 The unicode conversion of the URL will be moved to \Joomla\CMS\Form\Field\UrlField::getLayoutData +if ($value !== null) +{ + $value = $this->escape(PunycodeHelper::urlToUTF8($value)); +} ?> @@ -69,5 +75,5 @@ name="" id="" - value="" + value="" > diff --git a/layouts/joomla/html/image.php b/layouts/joomla/html/image.php new file mode 100644 index 0000000000000..2c24e765f39a5 --- /dev/null +++ b/layouts/joomla/html/image.php @@ -0,0 +1,49 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +/** + * Layout variables + * ----------------- + * @var array $displayData Array with all the given attributes for the image element. + * Eg: src, class, alt, width, height, loading, decoding, style, data-* + * Note: only the alt and src attributes are escaped by default! + */ +defined('_JEXEC') or die; + +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\Utilities\ArrayHelper; + +$img = HTMLHelper::_('cleanImageURL', $displayData['src']); + +$displayData['src'] = $this->escape($img->url); + +if (isset($displayData['alt'])) +{ + if ($displayData['alt'] === false) + { + unset($displayData['alt']); + } + else + { + $displayData['alt'] = $this->escape($displayData['alt']); + } +} + +if ($img->attributes['width'] > 0 && $img->attributes['height'] > 0) +{ + $displayData['width'] = $img->attributes['width']; + $displayData['height'] = $img->attributes['height']; + + if (empty($displayData['loading'])) + { + $displayData['loading'] = 'lazy'; + } +} + +echo ''; diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index 082b354d8bd51..29f4d735faec5 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -385,7 +385,7 @@ public function login($credentials, $options = array()) if (!($result instanceof \Exception)) { - $lang = $this->input->getCmd('lang'); + $lang = $this->input->getCmd('lang', ''); $lang = preg_replace('/[^A-Z-]/i', '', $lang); if ($lang) diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index 331ac25d97e1a..4b70a394fd06c 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -199,7 +199,7 @@ public function checkSession() public function enqueueMessage($msg, $type = self::MSG_INFO) { // Don't add empty messages. - if (trim($msg) === '') + if ($msg === null || trim($msg) === '') { return; } diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php index 8b218c56a26a4..a4d9b854c5c67 100644 --- a/libraries/src/Application/ConsoleApplication.php +++ b/libraries/src/Application/ConsoleApplication.php @@ -446,7 +446,7 @@ public function setName(string $name): void * * @return Router * - * @since __DEPLOY_VERSION__ + * @since 4.0.6 * @throws \InvalidArgumentException */ public static function getRouter($name = null, array $options = array()) diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php index 52fea8727b2ca..1e07878b7e4b1 100644 --- a/libraries/src/Document/HtmlDocument.php +++ b/libraries/src/Document/HtmlDocument.php @@ -11,6 +11,7 @@ \defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\Cache; +use Joomla\CMS\Cache\CacheControllerFactoryInterface; use Joomla\CMS\Factory as CmsFactory; use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Helper\ModuleHelper; @@ -559,8 +560,21 @@ public function getBuffer($type = null, $name = null, $attribs = array()) if ($this->_caching == true && $type === 'modules' && $name !== 'debug') { /** @var \Joomla\CMS\Document\Renderer\Html\ModulesRenderer $renderer */ - $cache = CmsFactory::getCache('com_modules', ''); - $hash = md5(serialize(array($name, $attribs, null, get_class($renderer)))); + /** @var \Joomla\CMS\Cache\Controller\OutputController $cache */ + $cache = CmsFactory::getContainer()->get(CacheControllerFactoryInterface::class) + ->createCacheController('output', ['defaultgroup' => 'com_modules']); + $itemId = (int) CmsFactory::getApplication()->input->get('Itemid', 0, 'int'); + + $hash = md5( + serialize( + [ + $name, + $attribs, + \get_class($renderer), + $itemId, + ] + ) + ); $cbuffer = $cache->get('cbuffer_' . $type); if (isset($cbuffer[$hash])) diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php index edc5a1404bc33..9fdf704fdf2fb 100644 --- a/libraries/src/Form/Field/ComponentlayoutField.php +++ b/libraries/src/Form/Field/ComponentlayoutField.php @@ -74,7 +74,7 @@ protected function getInput() if ($this->form instanceof Form) { - $template_style_id = $this->form->getValue('template_style_id'); + $template_style_id = $this->form->getValue('template_style_id', null, 0); $template_style_id = (int) preg_replace('#\W#', '', $template_style_id); } diff --git a/libraries/src/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php index fbaf60700c83d..ea8cd7d00335d 100644 --- a/libraries/src/Form/Field/MediaField.php +++ b/libraries/src/Form/Field/MediaField.php @@ -321,7 +321,7 @@ public function getLayoutData() $this->folder = 'local-' . $adapterName . ':/' . implode('/', $paths); } } - elseif ($this->directory && strpos(':', $this->directory)) + elseif ($this->directory && strpos($this->directory, ':')) { /** * Directory contains adapter information and path, for example via programming or directly defined in xml diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php index f38f990843707..cead3e7e0f81f 100644 --- a/libraries/src/Form/Field/ModulelayoutField.php +++ b/libraries/src/Form/Field/ModulelayoutField.php @@ -75,7 +75,7 @@ protected function getInput() if ($this->form instanceof Form) { - $template_style_id = $this->form->getValue('template_style_id'); + $template_style_id = $this->form->getValue('template_style_id', null, 0); $template_style_id = (int) preg_replace('#\W#', '', $template_style_id); } diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php index c477f34c52dcf..ecff6faf366a5 100644 --- a/libraries/src/Form/Field/SubformField.php +++ b/libraries/src/Form/Field/SubformField.php @@ -242,7 +242,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null) protected function getInput() { // Prepare data for renderer - $data = parent::getLayoutData(); + $data = $this->getLayoutData(); $tmpl = null; $control = $this->name; diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php index 5d5775ba2a030..c6a9af1d7f290 100644 --- a/libraries/src/Form/FormRule.php +++ b/libraries/src/Form/FormRule.php @@ -45,7 +45,7 @@ class FormRule * @var string * @since 1.6 */ - protected $modifiers; + protected $modifiers = ''; /** * Method to test the value. diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index b538febff82ef..04b79ec48aea5 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -684,19 +684,11 @@ public static function cleanImageURL($url) { $obj->attributes['width'] = $width; } - else - { - unset($obj->attributes['width']); - } if ($height > 0) { $obj->attributes['height'] = $height; } - else - { - unset($obj->attributes['height']); - } $mediaUri->setFragment(''); $obj->url = $mediaUri->toString(); @@ -741,6 +733,12 @@ public static function image($file, $alt, $attribs = null, $relative = false, $r return $file; } + // Ensure we have a valid default for concatenating + if ($attribs === null) + { + $attribs = ''; + } + return '' . $alt . ''; } diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php index 525853b07d016..1e418087d0581 100644 --- a/libraries/src/Helper/MediaHelper.php +++ b/libraries/src/Helper/MediaHelper.php @@ -186,7 +186,7 @@ public static function checkFileExtension($extension, $component = 'com_media', } $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv'))); - $ignored = array_map('trim', explode(',', $params->get('ignore_extensions'))); + $ignored = array_map('trim', explode(',', $params->get('ignore_extensions', ''))); if ($extension == '' || $extension == false || (!\in_array($extension, $allowable, true) && !\in_array($filetype, $ignored, true))) { @@ -246,7 +246,7 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables = // Remove allowed executables from array if (count($allowedExecutables)) { - $executable = array_diff($executables, $allowedExecutables); + $executables = array_diff($executables, $allowedExecutables); } $check = array_intersect($filetypes, $executables); @@ -261,7 +261,7 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables = $filetype = array_pop($filetypes); $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv'))); - $ignored = array_map('trim', explode(',', $params->get('ignore_extensions'))); + $ignored = array_map('trim', explode(',', $params->get('ignore_extensions', ''))); if ($filetype == '' || $filetype == false || (!\in_array($filetype, $allowable) && !\in_array($filetype, $ignored))) { diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php index 83880df3acc65..1a46329b3a240 100644 --- a/libraries/src/Helper/ModuleHelper.php +++ b/libraries/src/Helper/ModuleHelper.php @@ -84,12 +84,10 @@ public static function &getModule($name, $title = null) public static function &getModules($position) { $position = strtolower($position); - $result = array(); - $input = Factory::getApplication()->input; - - $modules =& static::load(); - - $total = \count($modules); + $result = array(); + $input = Factory::getApplication()->input; + $modules = &static::load(); + $total = \count($modules); for ($i = 0; $i < $total; $i++) { @@ -99,14 +97,16 @@ public static function &getModules($position) } } - if (\count($result) === 0) + // Prepend a dummy module for template preview + if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')) { - if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')) - { - $result[0] = static::createDummyModule(); - $result[0]->title = $position; - $result[0]->position = $position; - } + $dummy = static::createDummyModule(); + $dummy->title = $position; + $dummy->position = $position; + $dummy->content = $position; + $dummy->contentRendered = true; + + array_unshift($result, $dummy); } return $result; diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php index 32c6aa2fb8ec0..5251780df318b 100644 --- a/libraries/src/Installer/Installer.php +++ b/libraries/src/Installer/Installer.php @@ -23,6 +23,7 @@ use Joomla\CMS\Table\Table; use Joomla\Database\DatabaseDriver; use Joomla\Database\Exception\ExecutionFailureException; +use Joomla\Database\Exception\PrepareStatementFailureException; use Joomla\Database\ParameterType; /** @@ -1174,6 +1175,9 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid) $version = '0.0.0'; } + Log::add(Text::_('JLIB_INSTALLER_SQL_BEGIN'), Log::INFO, 'Update'); + Log::add(Text::sprintf('JLIB_INSTALLER_SQL_BEGIN_SCHEMA', $version), Log::INFO, 'Update'); + foreach ($files as $file) { if (version_compare($file, $version) > 0) @@ -1200,19 +1204,28 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid) // Process each query in the $queries array (split out of sql file). foreach ($queries as $query) { + $queryString = (string) $query; + $queryString = str_replace(array("\r", "\n"), array('', ' '), substr($queryString, 0, 80)); + try { $db->setQuery($query)->execute(); } - catch (ExecutionFailureException $e) + catch (ExecutionFailureException | PrepareStatementFailureException $e) { - Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $e->getMessage()), Log::WARNING, 'jerror'); + $errorMessage = Text::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $e->getMessage()); + + // Log the error in the update log file + Log::add(Text::sprintf('JLIB_INSTALLER_UPDATE_LOG_QUERY', $file, $queryString), Log::INFO, 'Update'); + Log::add($errorMessage, Log::INFO, 'Update'); + Log::add(Text::_('JLIB_INSTALLER_SQL_END_NOT_COMPLETE'), Log::INFO, 'Update'); + + // Show the error message to the user + Log::add($errorMessage, Log::WARNING, 'jerror'); return false; } - $queryString = (string) $query; - $queryString = str_replace(array("\r", "\n"), array('', ' '), substr($queryString, 0, 80)); Log::add(Text::sprintf('JLIB_INSTALLER_UPDATE_LOG_QUERY', $file, $queryString), Log::INFO, 'Update'); $update_count++; @@ -1248,6 +1261,8 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid) return false; } + + Log::add(Text::_('JLIB_INSTALLER_SQL_END'), Log::INFO, 'Update'); } } } diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php index 02c45dbd83128..6b0a2a715f353 100644 --- a/libraries/src/MVC/Controller/BaseController.php +++ b/libraries/src/MVC/Controller/BaseController.php @@ -310,7 +310,7 @@ public static function getInstance($prefix, $config = array()) else { // Base controller. - $type = null; + $type = ''; // Define the controller filename and path. $file = self::createFileName('controller', array('name' => 'controller', 'format' => $format)); diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php index c4b1709e8ee24..1cf5bec0c71d2 100644 --- a/libraries/src/Service/Provider/Database.php +++ b/libraries/src/Service/Provider/Database.php @@ -44,7 +44,11 @@ function (Container $container) { $conf = $container->get('config'); - $dbtype = $conf->get('dbtype'); + /** + * @todo: This 'sensible' default is required in the installer for now. Eventually we need to + * refactor the installer so it is not required + */ + $dbtype = $conf->get('dbtype', 'mysqli'); /* * In Joomla! 3.x and earlier the `mysql` type was used for the `ext/mysql` PHP extension, which is no longer supported. diff --git a/libraries/src/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php index f743205a4692f..f839afee88ff0 100644 --- a/libraries/src/String/PunycodeHelper.php +++ b/libraries/src/String/PunycodeHelper.php @@ -132,7 +132,7 @@ public static function urlToUTF8($uri) { if (empty($uri)) { - return; + return ''; } $parsed = UriHelper::parse_url($uri); diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php index a770cca60fae5..42b97eea88319 100644 --- a/libraries/src/Table/User.php +++ b/libraries/src/Table/User.php @@ -543,6 +543,11 @@ public function setLastVisit($timeStamp = null, $userId = null) } // If no timestamp value is passed to function, than current time is used. + if ($timeStamp === null) + { + $timeStamp = 'now'; + } + $date = Factory::getDate($timeStamp); $userId = (int) $userId; $lastVisit = $date->toSql(); diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php index 25f81a057cfa2..4bd05be98512a 100644 --- a/libraries/src/User/UserHelper.php +++ b/libraries/src/User/UserHelper.php @@ -562,7 +562,15 @@ public static function getShortHashedUserAgent() $ua = Factory::getApplication()->client; $uaString = $ua->userAgent; $browserVersion = $ua->browserVersion; - $uaShort = str_replace($browserVersion, 'abcd', $uaString); + + if ($browserVersion) + { + $uaShort = str_replace($browserVersion, 'abcd', $uaString); + } + else + { + $uaShort = $uaString; + } return md5(Uri::base() . $uaShort); } diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php index 58c9385a30fdd..a52ba884daf8d 100644 --- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php +++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php @@ -328,7 +328,7 @@ public static function getList(&$params) public static function _cleanIntrotext($introtext) { $introtext = str_replace(array('

', '

'), ' ', $introtext); - $introtext = strip_tags($introtext, ''); + $introtext = strip_tags($introtext, ''); $introtext = trim($introtext); return $introtext; diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php index 426a094319ccf..2d974570fde56 100644 --- a/modules/mod_articles_news/tmpl/_item.php +++ b/modules/mod_articles_news/tmpl/_item.php @@ -27,7 +27,13 @@ get('img_intro_full') !== 'none' && !empty($item->imageSrc)) : ?>
- <?php echo $item->imageAlt; ?> + $item->imageSrc, + 'alt' => $item->imageAlt, + ] + ); ?> imageCaption)) : ?>
imageCaption; ?> diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.php b/plugins/quickicon/phpversioncheck/phpversioncheck.php index b9056d9345da0..a6712038f437e 100644 --- a/plugins/quickicon/phpversioncheck/phpversioncheck.php +++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php @@ -127,6 +127,10 @@ private function getPhpSupport() 'security' => '2022-11-26', 'eos' => '2023-11-26', ), + '8.1' => array( + 'security' => '2023-11-25', + 'eos' => '2024-11-25', + ), ); // Fill our return array with default values diff --git a/plugins/system/httpheaders/httpheaders.php b/plugins/system/httpheaders/httpheaders.php index 7088295f2a118..258ee2bb0fe6f 100644 --- a/plugins/system/httpheaders/httpheaders.php +++ b/plugins/system/httpheaders/httpheaders.php @@ -13,6 +13,8 @@ use Joomla\CMS\Plugin\CMSPlugin; use Joomla\CMS\Uri\Uri; use Joomla\Database\DatabaseDriver; +use Joomla\Event\DispatcherInterface; +use Joomla\Event\Event; use Joomla\Event\SubscriberInterface; /** @@ -127,8 +129,8 @@ class PlgSystemHttpHeaders extends CMSPlugin implements SubscriberInterface /** * Constructor. * - * @param object &$subject The object to observe. - * @param array $config An optional associative array of configuration settings. + * @param DispatcherInterface $subject The object to observe. + * @param array $config An optional associative array of configuration settings. * * @since 4.0.0 */ @@ -163,7 +165,7 @@ public static function getSubscribedEvents(): array * * @since 4.0.0 */ - public function applyHashesToCspRule(): void + public function applyHashesToCspRule(Event $event): void { // CSP is only relevant on html pages. Let's early exit here. if ($this->app->getDocument()->getType() !== 'html') @@ -252,7 +254,7 @@ public function applyHashesToCspRule(): void * * @since 4.0.0 */ - public function setHttpHeaders(): void + public function setHttpHeaders(Event $event): void { // Set the default header when they are enabled $this->setStaticHeaders(); diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php index cb897cddfb4da..69af93bcf8e3e 100644 --- a/plugins/system/redirect/redirect.php +++ b/plugins/system/redirect/redirect.php @@ -235,6 +235,18 @@ public function handleError(ErrorEvent $event) // In case the url contains double // lets remove it $destination = str_replace(Uri::root() . '/', Uri::root(), $dest); + // Always count redirect hits + $redirect->hits++; + + try + { + $db->updateObject('#__redirect_links', $redirect, 'id'); + } + catch (Exception $e) + { + // We don't log issues for now + } + $app->redirect($destination, (int) $redirect->header); } diff --git a/templates/cassiopeia/component.php b/templates/cassiopeia/component.php index 6f77bbdcba4f3..d9875a8b93604 100644 --- a/templates/cassiopeia/component.php +++ b/templates/cassiopeia/component.php @@ -30,10 +30,10 @@ { if (stripos($paramsFontScheme, 'https://') === 0) { - $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', []); - $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', []); - $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style']); - $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']); + $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']); + $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']); if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) { diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php index e4512b06fb46a..6b055ac85dd55 100644 --- a/templates/cassiopeia/error.php +++ b/templates/cassiopeia/error.php @@ -45,10 +45,10 @@ { if (stripos($paramsFontScheme, 'https://') === 0) { - $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', []); - $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', []); - $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style']); - $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']); + $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']); + $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']); if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) { diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php index d3e5eb8a44ce9..06ba377bb1913 100644 --- a/templates/cassiopeia/index.php +++ b/templates/cassiopeia/index.php @@ -47,10 +47,10 @@ { if (stripos($paramsFontScheme, 'https://') === 0) { - $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', []); - $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', []); - $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style']); - $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']); + $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']); + $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']); if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) { diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php index 2b5c8861e4d3e..41422a162768a 100644 --- a/templates/cassiopeia/offline.php +++ b/templates/cassiopeia/offline.php @@ -41,10 +41,10 @@ { if (stripos($paramsFontScheme, 'https://') === 0) { - $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', []); - $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', []); - $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style']); - $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']); + $this->getPreloadManager()->preconnect('https://fonts.googleapis.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preconnect('https://fonts.gstatic.com/', ['crossorigin' => 'anonymous']); + $this->getPreloadManager()->preload($paramsFontScheme, ['as' => 'style', 'crossorigin' => 'anonymous']); + $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, [], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'', 'crossorigin' => 'anonymous']); if (preg_match_all('/family=([^?:]*):/i', $paramsFontScheme, $matches) > 0) { diff --git a/tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php b/tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php index fbbd27e1e0170..051bb4a633e8c 100644 --- a/tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php +++ b/tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php @@ -12,9 +12,9 @@ use Step\Acceptance\Administrator\Media; /* - * @todo test d&d upload of files - * @todo test download of files - * @todo enable skipped tests + * TODO test d&d upload of files + * TODO test download of files + * TODO enable skipped tests */ /** @@ -268,7 +268,7 @@ public function navigateUsingBreadcrumb(Media $I) * * @throws Exception * - * @since 4.1.0 + * @since 4.0.6 */ public function searchInFilesAndFolders(Media $I) { @@ -288,7 +288,7 @@ public function searchInFilesAndFolders(Media $I) * * @throws Exception * - * @since 4.1.0 + * @since 4.0.6 */ public function searchIsClearedOnNavigate(Media $I) { diff --git a/tests/Codeception/api/com_banners/BannerCest.php b/tests/Codeception/api/com_banners/BannerCest.php index 4588bd9d3a1e0..f6e9b1fccfa5d 100644 --- a/tests/Codeception/api/com_banners/BannerCest.php +++ b/tests/Codeception/api/com_banners/BannerCest.php @@ -124,7 +124,7 @@ public function testCrudOnCategory(ApiTester $I) $I->haveHttpHeader('Content-Type', 'application/json'); $I->haveHttpHeader('Accept', 'application/vnd.api+json'); - // Unpublish in order to allow the delete in the next step + // Trash in order to allow the delete in the next step $I->sendPATCH('/banners/categories/' . $categoryId, ['title' => 'Another Title', 'published' => -2]); $I->seeResponseCodeIs(HttpCode::OK);