From 4bbec310aa4d976eb7073218460fde6a92f9ffc3 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Fri, 15 Feb 2019 10:57:08 +0100
Subject: [PATCH] MDL-64495 admin: Removed setting page and deprecation

---
 lang/en/deprecated.txt     |  6 +++++-
 lang/en/message.php        |  8 ++++----
 lib/adminlib.php           | 10 ++++++++++
 lib/upgrade.txt            |  2 ++
 message/defaultoutputs.php |  3 +++
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 0d2e5023da4..951f2575634 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -142,4 +142,8 @@ userisblockingyounoncontact,core_message
 error:invalidbadgeurl,core_badges
 nomessages,core_message
 searchallavailablecourses_desc,core_admin
-search:mycourse,core_search
\ No newline at end of file
+search:mycourse,core_search
+outputdisabled,core_message
+outputdoesnotexist,core_message
+outputenabled,core_message
+outputnotconfigured,core_message
diff --git a/lang/en/message.php b/lang/en/message.php
index e1a75830ea3..598455afd2e 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -135,11 +135,7 @@ $string['offline'] = 'Offline';
 $string['on'] = 'On';
 $string['online'] = 'Online';
 $string['otherparticipants'] = 'Other participants';
-$string['outputdisabled'] = 'Output disabled';
-$string['outputdoesnotexist'] = 'Message output does not exist';
-$string['outputenabled'] = 'Output enabled';
 $string['outputnotavailable'] = 'Not available';
-$string['outputnotconfigured'] = 'Not configured';
 $string['participants'] = 'Participants';
 $string['permitted'] = 'Permitted';
 $string['privacy'] = 'Privacy';
@@ -260,3 +256,7 @@ $string['userisblockingyounoncontact'] = '{$a} only accepts messages from their
 
 // Deprecated since Moodle 3.7.
 $string['nomessages'] = 'No messages';
+$string['outputdisabled'] = 'Output disabled';
+$string['outputdoesnotexist'] = 'Message output does not exist';
+$string['outputenabled'] = 'Output enabled';
+$string['outputnotconfigured'] = 'Not configured';
diff --git a/lib/adminlib.php b/lib/adminlib.php
index f7a21b2f16e..07f66e4aa9c 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6388,14 +6388,24 @@ class admin_page_managemessageoutputs extends admin_externalpage {
 /**
  * Default message outputs configuration
  *
+ * @deprecated since Moodle 3.7 MDL-64495. Please use admin_page_managemessageoutputs instead.
+ * @todo       MDL-64866 This will be deleted in Moodle 4.1.
+ *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class admin_page_defaultmessageoutputs extends admin_page_managemessageoutputs {
     /**
      * Calls parent::__construct with specific arguments
+     *
+     * @deprecated since Moodle 3.7 MDL-64495. Please use admin_page_managemessageoutputs instead.
+     * @todo       MDL-64866 This will be deleted in Moodle 4.1.
      */
     public function __construct() {
         global $CFG;
+
+        debugging('admin_page_defaultmessageoutputs class is deprecated. Please use admin_page_managemessageoutputs instead.',
+            DEBUG_DEVELOPER);
+
         admin_externalpage::__construct('defaultmessageoutputs', get_string('defaultmessageoutputs', 'message'), new moodle_url('/message/defaultoutputs.php'));
     }
 }
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 7218fab4496..eac3b254be9 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -15,6 +15,8 @@ attribute on forms to avoid collisions in forms loaded in AJAX requests.
   It is recommended that privacy providers using this function call rewrite any long query into a number of separate
   calls to add_from_sql for improved performance, and that the new argument is used.
   This will allow queries to remain backwards-compatible with older versions of Moodle but will have significantly better performance in version supporting the innerjoin parameter.
+* /message/defaultoutputs.php file and admin_page_defaultmessageoutputs class have been deprecated
+  and all their settings moved to admin/message.php (see MDL-64495). Please use admin_page_managemessageoutputs class instead.
 
 === 3.6 ===
 
diff --git a/message/defaultoutputs.php b/message/defaultoutputs.php
index 994d6ebc66b..1dfff8d36e7 100644
--- a/message/defaultoutputs.php
+++ b/message/defaultoutputs.php
@@ -20,6 +20,9 @@
  * @package   core_message
  * @copyright 2011 Lancaster University Network Services Limited
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @deprecated since Moodle 3.7 MDL-64495. Please use /admin/message.php instead.
+ * @todo       MDL-64866 This will be deleted in Moodle 4.1.
  */
 require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/message/lib.php');