Merge branch '5.4-dev' into 54-autoupdate-email-groups

Author: richard67

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -544,6 +544,8 @@ public function prepareAutoUpdate(string $targetVersion): array
             throw new \Exception('Could not write update file', 410);
         }
 
+        Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $fileInformation['basename']), Log::INFO, 'Update');
+
         $app = Factory::getApplication();
 
         return [

administrator/language/en-GB/com_joomlaupdate.ini

@@ -109,7 +109,7 @@ COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL="Starting installation of new version."
 COM_JOOMLAUPDATE_UPDATE_LOG_START="Update started by user %2$s (%1$s). Old version is %3$s."
 COM_JOOMLAUPDATE_UPDATE_LOG_UNINSTALL_EXTENSIONS="Uninstalling extensions"
 COM_JOOMLAUPDATE_UPDATE_LOG_UPLOAD="Uploading update file"
-COM_JOOMLAUPDATE_UPDATE_LOG_URL="Downloading update file from %s."
+COM_JOOMLAUPDATE_UPDATE_LOG_URL="Attempting to download update file from %s."
 COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_BODY="This email IS NOT sent by the Joomla! project. It is sent automatically by your own site,\n{SITENAME} - {URL} \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\nYour site has been successfully automatically updated from {OLDVERSION} to {NEWVERSION}.\nPlease check your site for any unexpected behavior or malfunctions.\nThis email is sent to you by your site.\nThe Joomla! project will never contact you directly.\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\nThis email has been automatically sent by Joomla!, the software which powers your site.\nYou have enabled automatic updates in your site and the installation of such an update triggers this message.\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\nThis email is sent to you by your own site, {SITENAME}"
 COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_SUBJECT="Joomla! updated successfully at {SITENAME} – {URL}"
 COM_JOOMLAUPDATE_UPDATING_COMPLETE="The update is finalising."

installation/language/en-GB/joomla.ini

@@ -144,6 +144,13 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla was unable to connect to the languag
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla Administrator."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
 
+; Automated Updates Opt Out
+INSTL_AUTOMATED_UPDATES="Automated Updates"
+INSTL_AUTOMATED_UPDATES_DESC="Joomla automatically updates itself for minor and patch releases.<br><br><strong>Please note:</strong> Automated Updates will register your site at the respective service provided by the Joomla! project. The registration allows the Joomla project to access information about your site and server environment, specifically Site Url, PHP version, Database type and version, CMS version and Server OS type and version. This information is only used to improve the service.<br><br>Alternatively you can disable automated updates using the button below."
+INSTL_AUTOMATED_UPDATES_DISABLE="Disable Automated Updates"
+INSTL_DISABLE_AUTOUPDATE="Are you sure you want to disable automated updates?"
+INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="Could not disable automated updates."
+
 ; Default language view
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language"
 INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as the default language for the Backend Administrator."

installation/src/Controller/InstallationController.php

@@ -299,4 +299,42 @@ public function delete()
         // We can't send a response with sendJsonResponse because our installation classes now do not exist
         echo json_encode(['error' => false]);
     }
+
+    /**
+     * Opt out from automated updates
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function disableAutomatedUpdates()
+    {
+        $this->checkValidToken();
+
+        /** @var \Joomla\CMS\Installation\Model\AutomatedUpdatesModel $model */
+        $model = $this->getModel('AutomatedUpdates');
+
+        if (!$model->disable()) {
+            // We can't send a response with sendJsonResponse because our installation classes might not exist yet
+            $error = [
+                'token' => Session::getFormToken(true),
+                'error' => true,
+                'data'  => [
+                    'view' => 'remove',
+                ],
+                'messages' => [
+                    'warning' => [
+                        Text::sprintf('INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE'),
+                    ],
+                ],
+            ];
+
+            echo json_encode($error);
+
+            return;
+        }
+
+        // We can't send a response with sendJsonResponse because our installation classes do not exist yet
+        echo json_encode(['error' => false]);
+    }
 }

installation/src/Model/AutomatedUpdatesModel.php

@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @package     Joomla.Installation
+ * @subpackage  Model
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installation\Model;
+
+use Joomla\CMS\Factory;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Automated Updates model for the Joomla Core Installer.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AutomatedUpdatesModel extends BaseInstallationModel implements DatabaseAwareInterface
+{
+    use DatabaseAwareTrait;
+
+    /**
+     * @since  __DEPLOY_VERSION__
+     */
+    public function __construct()
+    {
+        // Overrides application config and set the configuration.php file so tokens and database works.
+        if (file_exists(JPATH_BASE . '/configuration.php')) {
+            /** @phpstan-ignore class.notFound */
+            Factory::getApplication()->setConfiguration(new Registry(new \JConfig()));
+        }
+
+        parent::__construct();
+    }
+
+    /**
+     * Opt out from automated Updates
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function disable()
+    {
+        // Get the params of com_joomlaupdate
+        $db        = $this->getDatabase();
+        $query     = $db->getQuery(true);
+
+        $query->select('params')
+            ->from($db->quoteName('#__extensions'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
+
+        $params = new Registry($db->setQuery($query)->loadResult());
+        $params->set('autoupdate', 0);
+        $params->set('autoupdate_status', 0);
+
+        // Update the language settings in the language manager.
+        $query->clear()
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
+        $db->setQuery($query)->execute();
+
+        return true;
+    }
+}

installation/template/index.php

@@ -55,12 +55,11 @@
 Text::script('INSTL');
 Text::script('INSTL_FINISHED');
 Text::script('INSTL_IN_PROGRESS');
-
-// Load the JavaScript translated messages
 Text::script('INSTL_PROCESS_BUSY');
 
 // Load strings for translated messages (directory removal)
 Text::script('INSTL_REMOVE_INST_FOLDER');
+Text::script('INSTL_DISABLE_AUTOUPDATE');
 Text::script('INSTL_COMPLETE_REMOVE_FOLDER');
 ?>
 <!DOCTYPE html>

installation/template/js/remove.js

@@ -41,6 +41,17 @@ if (document.getElementById('removeInstallationFolder')) {
 		});
 }
 
+if (document.getElementById('automatedUpdatesDisableButton')) {
+  document.getElementById('automatedUpdatesDisableButton')
+    .addEventListener('click', function (e) {
+      e.preventDefault();
+      let confirm = window.confirm(Joomla.Text._('INSTL_DISABLE_AUTOUPDATE'));
+      if (confirm) {
+        Joomla.disableAutomatedUpdates();
+      }
+    });
+}
+
 const completeInstallationOptions = document.querySelectorAll('.complete-installation');
 
 completeInstallationOptions.forEach(function(item) {
@@ -59,6 +70,35 @@ completeInstallationOptions.forEach(function(item) {
     });
 });
 
+
+Joomla.disableAutomatedUpdates = function () {
+  Joomla.request({
+    method: "POST",
+    url: Joomla.installationBaseUrl + '?task=installation.disableAutomatedUpdates&format=json',
+    perform: true,
+    token: true,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    onSuccess: function (response) {
+      const successresponse = JSON.parse(response);
+      if (successresponse.error === true) {
+        if (successresponse.messages) {
+          Joomla.renderMessages(successresponse.messages);
+          Joomla.loadOptions({'csrf.token': successresponse.token});
+        } else {
+          // Stuff went wrong. No error messages. Just panic bail!
+          Joomla.renderMessages({error:['Unknown error disabling the automated updates.']});
+        }
+      } else {
+        const automatedUpdates = document.getElementById('automatedUpdates');
+        automatedUpdates.parentNode.removeChild(automatedUpdates);
+      }
+    },
+    onError: function (xhr) {
+      Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+    }
+  });
+}
+
 Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
     Joomla.request({
         method: "POST",
@@ -77,6 +117,9 @@ Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
             if (document.getElementById('installAddFeatures')) {
                 document.getElementById('installAddFeatures').disabled = true;
             }
+            if (document.getElementById('automatedUpdatesDisableButton')) {
+                document.getElementById('automatedUpdatesDisableButton').disabled = true;
+            }
             if (document.getElementById('removeInstallationFolder')) {
                 document.getElementById('removeInstallationFolder').disabled = true;
             }
@@ -92,6 +135,14 @@ Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
             } else {
                 const customInstallation = document.getElementById('customInstallation');
                 customInstallation.parentNode.removeChild(customInstallation);
+
+                const automatedUpdates = document.getElementById('automatedUpdates');
+
+                // This will only exist if it has not been removed with a previous step
+                if (automatedUpdates) {
+                    automatedUpdates.parentNode.removeChild(automatedUpdates);
+                }
+
                 const removeInstallationTab = document.getElementById('removeInstallationTab');
 
                 // This will only exist in debug mode