[6.0] Fixes the missing modified start and end date filter to articled API endpoint (joomla#45142)

Author: laoneo

administrator/components/com_content/src/Model/ArticlesModel.php

@@ -504,6 +504,22 @@ protected function getListQuery()
                 ->bind(':tag', $tag, ParameterType::INTEGER);
         }
 
+        // Filter by date after modified date.
+        $modifiedStartDateTime = $this->getState('filter.modified_start');
+
+        if (!empty($modifiedStartDateTime)) {
+            $query->where($db->quoteName('a.modified') . ' >= :startDate')
+                ->bind(':startDate', $modifiedStartDateTime);
+        }
+
+        // Filter by date before modified date.
+        $modifiedEndDateTime = $this->getState('filter.modified_end');
+
+        if (!empty($modifiedEndDateTime)) {
+            $query->where($db->quoteName('a.modified') . ' <= :endDate')
+                ->bind(':endDate', $modifiedEndDateTime);
+        }
+
         // Add the list ordering clause.
         $orderCol  = $this->state->get('list.ordering', $defaultOrdering);
         $orderDirn = $this->state->get('list.direction', 'DESC');

administrator/components/com_users/src/Model/BackupcodesModel.php

@@ -252,7 +252,7 @@ public function isBackupCode($code, ?User $user = null): bool
          */
         $otherResult = false;
 
-        $temp1 = '';
+        $temp1 = [];
 
         for ($i = 0; $i < 10; $i++) {
             $temp1[$i] = random_int(0, 99999999);

api/components/com_content/src/Controller/ArticlesController.php

@@ -82,6 +82,14 @@ public function displayList()
             $this->modelState->set('filter.language', $filter->clean($apiFilterInfo['language'], 'STRING'));
         }
 
+        if (\array_key_exists('modified_start', $apiFilterInfo)) {
+            $this->modelState->set('filter.modified_start', $filter->clean($apiFilterInfo['modified_start'], 'STRING'));
+        }
+
+        if (\array_key_exists('modified_end', $apiFilterInfo)) {
+            $this->modelState->set('filter.modified_end', $filter->clean($apiFilterInfo['modified_end'], 'STRING'));
+        }
+
         $apiListInfo = $this->input->get('list', [], 'array');
 
         if (\array_key_exists('ordering', $apiListInfo)) {

build/build-modules-js/javascript/build-bootstrap-js.mjs

@@ -3,7 +3,7 @@ import {
 } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { transform } from 'esbuild';
-import rimraf from 'rimraf';
+import { rimrafSync } from 'rimraf';
 import { rollup } from 'rollup';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
@@ -65,6 +65,13 @@ const build = async () => {
         ],
       }),
     ],
+  });
+
+  await bundle.write({
+    format: 'es',
+    sourcemap: false,
+    dir: outputFolder,
+    chunkFileNames: '[name].js',
     manualChunks: {
       alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
       button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
@@ -86,19 +93,12 @@ const build = async () => {
     },
   });
 
-  await bundle.write({
-    format: 'es',
-    sourcemap: false,
-    dir: outputFolder,
-    chunkFileNames: '[name].js',
-  });
-
   // closes the bundle
   await bundle.close();
 };
 
 export const bootstrapJs = async () => {
-  rimraf.sync(resolve(outputFolder));
+  rimrafSync(resolve(outputFolder));
 
   try {
     await build(resolve(inputFolder, 'index.es6.js'));

build/build.php

@@ -122,6 +122,8 @@ function clean_checkout(string $dir)
     system('find libraries/vendor -name _config.yml | xargs rm -rf -');
     system('find libraries/vendor -name .bowerrc | xargs rm -rf -');
     system('find libraries/vendor -name bower.json | xargs rm -rf -');
+    system('find libraries/vendor -name .drone.yml | xargs rm -rf -');
+    system('find libraries/vendor -name .drone.jsonnet | xargs rm -rf -');
     system('rm -rf libraries/vendor/bin');
 
     // aldo26-matthias/idna-convert

build/media_source/plg_installer_webinstaller/js/client.es6.js

@@ -413,7 +413,7 @@ customElements.whenDefined('joomla-tab').then(() => {
     link.click();
   }
 
-  if (link.hasAttribute('aria-expanded') && link.getAttribute('aria-expanded') === 'true' && !instance) {
+  if (link.hasAttribute('aria-selected') && link.getAttribute('aria-selected') === 'true' && !instance) {
     instance = new WebInstaller();
     instance.initialise();
   }

composer.json

@@ -63,7 +63,7 @@
     "joomla/event": "^3.0.1",
     "joomla/filter": "^3.0.2",
     "joomla/filesystem": "^3.1.0",
-    "joomla/http": "^3.0.1",
+    "joomla/http": "^3.1.0",
     "joomla/input": "~3.0",
     "joomla/language": "~3.0",
     "joomla/oauth1": "~3.0",
@@ -74,7 +74,7 @@
     "joomla/string": "^3.0.1",
     "joomla/uri": "~3.0",
     "joomla/utilities": "~3.0",
-    "algo26-matthias/idna-convert": "^3.1.1",
+    "algo26-matthias/idna-convert": "^4.0.4",
     "defuse/php-encryption": "^2.4.0",
     "doctrine/inflector": "^1.4.4",
     "fig/link-util": "^1.2.0",
@@ -108,13 +108,13 @@
     "phpseclib/bcmath_compat": "^2.0.3",
     "jfcherng/php-diff": "^6.16.2",
     "voku/portable-utf8": "dev-joomla-5.3 as 6.0.13",
-    "php-tuf/php-tuf": "^1.0.2",
+    "php-tuf/php-tuf": "^1.0.3",
     "php-debugbar/php-debugbar": "^2.1.6"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.22",
     "friendsofphp/php-cs-fixer": "^3.72.0",
-    "squizlabs/php_codesniffer": "^3.11.3",
+    "squizlabs/php_codesniffer": "^3.12.0",
     "joomla/mediawiki": "^3.0",
     "joomla/test": "~3.0",
     "phpstan/phpstan": "^2.1.8",