[6.0] Upmerges - 2025-11-18

Merge pull request #46463 from Bodge-IT/upmerges/2025-11-18

Author: Bodge-IT

administrator/components/com_finder/src/Model/FilterModel.php

@@ -11,11 +11,9 @@
 namespace Joomla\Component\Finder\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Component\Finder\Administrator\Table\FilterTable;
-use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -151,137 +149,4 @@ public function getTotal()
 
         return $db->setQuery($query)->loadResult();
     }
-
-    /**
-     * Method to save the form data.
-     *
-     * Overrides the parent to correctly handle the 'save2copy' task for Finder filters.
-     *
-     * @param   array   $data  The form data.
-     *
-     * @return  boolean        True on success, false on failure.
-     *
-     * @since   6.0.1
-     */
-    public function save($data)
-    {
-        $app  = Factory::getApplication();
-        $task = $app->getInput()->get('task', '', 'cmd');
-
-        if ($task === 'save2copy') {
-            $data['filter_id'] = 0;
-
-            $title = trim((string) ($data['title'] ?? ''));
-            $alias = trim((string) ($data['alias'] ?? ''));
-
-            if ($alias === '') {
-                $alias = OutputFilter::stringURLSafe($title);
-            }
-
-            // Generate unique title + alias
-            list($title, $alias) = $this->generateNewTitleAndAlias($title, $alias);
-
-            $data['title'] = $title;
-            $data['alias'] = $alias;
-        }
-
-        return parent::save($data);
-    }
-
-    /**
-     * Generate a new unique title and alias for a copied filter.
-     * Follows the same logic as Joomla's core content models.
-     *
-     * @param   string  $title  The original title.
-     * @param   string  $alias  The original alias.
-     *
-     * @return  array           Array with [newTitle, newAlias].
-     *
-     * @since   6.0.1
-     */
-    protected function generateNewTitleAndAlias(string $title, string $alias): array
-    {
-        $db = $this->getDatabase();
-
-        if (preg_match('/^(.*?)(?:\s\((\d+)\))?$/', $title, $matches)) {
-            $baseTitle = trim($matches[1]);
-        } else {
-            $baseTitle = trim($title);
-        }
-
-        $baseAlias = trim($alias ?: OutputFilter::stringURLSafe($title));
-
-        $likeTitle = $db->quote($db->escape($baseTitle, true) . '%', false);
-
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('title'))
-            ->from($db->quoteName('#__finder_filters'))
-            ->where($db->quoteName('title') . ' LIKE ' . $likeTitle);
-
-        $existingTitles = $db->setQuery($query)->loadColumn();
-
-        $maxNum = 0;
-        foreach ($existingTitles as $existing) {
-            if (preg_match('/^\Q' . $baseTitle . '\E(?:\s\((\d+)\))?$/', $existing, $matches)) {
-                $num = isset($matches[1]) ? (int) $matches[1] : 1;
-                if ($num > $maxNum) {
-                    $maxNum = $num;
-                }
-            }
-        }
-
-        $nextNum = $maxNum + 1;
-
-        $newTitle = $baseTitle;
-        if ($nextNum > 1) {
-            $newTitle .= ' (' . $nextNum . ')';
-        }
-
-        // Build a unique alias
-        $newAlias = $this->getUniqueAlias($baseAlias);
-
-        return [$newTitle, $newAlias];
-    }
-
-    /**
-     * Ensure a unique alias in the table by incrementing with dash style.
-     *
-     *
-     * @param   string  $base  The starting alias (already URL-safe).
-     *
-     * @return  string         A unique alias.
-     *
-     * @since   6.0.1
-     */
-    protected function getUniqueAlias(string $base): string
-    {
-        $alias = $base !== '' ? $base : OutputFilter::stringURLSafe(uniqid('filter-', true));
-
-        while ($this->aliasExists($alias)) {
-            $alias = StringHelper::increment($alias, 'dash');
-        }
-
-        return $alias;
-    }
-
-    /**
-     * Check whether an alias exists in the table.
-     *
-     * @param   string  $alias  The alias to test.
-     *
-     * @return  boolean         True if it exists, false otherwise.
-     *
-     * @since   6.0.1
-     */
-    protected function aliasExists(string $alias): bool
-    {
-        $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
-            ->select('COUNT(*)')
-            ->from($db->quoteName('#__finder_filters'))
-            ->where($db->quoteName('alias') . ' = :alias')
-            ->bind(':alias', $alias);
-
-        return (int) $db->setQuery($query)->loadResult() > 0;
-    }
 }

administrator/components/com_finder/tmpl/filters/default.php

@@ -59,9 +59,6 @@
                             <th scope="col">
                                 <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
                             </th>
-                            <th scope="col">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JALIAS', 'a.alias', $listDirn, $listOrder); ?>
-                            </th>
                             <th scope="col" class="w-10 d-none d-md-table-cell">
                                 <?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
                             </th>
@@ -106,9 +103,6 @@
                                     <?php echo $escapedTitle; ?>
                                 <?php endif; ?>
                             </th>
-                            <td class="d-none d-md-table-cell">
-                                <?php echo $item->alias; ?>
-                            </td>
                             <td class="d-none d-md-table-cell">
                                 <?php echo $item->created_by_alias ?: $item->user_name; ?>
                             </td>

installation/src/Model/ChecksModel.php

@@ -260,7 +260,7 @@ public function getForm($view = null)
      *
      * @return  boolean
      *
-     * @since   6.0.1
+     * @since   5.4.1
      */
     public function getAutoUpdatesDisabled(): bool
     {

installation/src/View/Remove/HtmlView.php

@@ -70,7 +70,7 @@ class HtmlView extends BaseHtmlView
      * If updates are disabled, we hide the box
      *
      * @var    boolean
-     * @since  6.0.1
+     * @since  5.4.1
      */
     protected $autoUpdatesDisabled = false;