From 123631ad4718141627d77027dbef0448bae22ac8 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 20 Feb 2018 16:27:57 +0800 Subject: [PATCH] MDL-36941 message_popup: removed 'message_popup' table --- message/output/popup/classes/api.php | 7 ++-- message/output/popup/db/events.php | 36 ------------------- message/output/popup/db/install.xml | 22 ------------ message/output/popup/db/upgrade.php | 11 ++++++ message/output/popup/message_output_popup.php | 24 ------------- message/output/popup/tests/base.php | 16 +-------- message/output/popup/version.php | 2 +- 7 files changed, 16 insertions(+), 102 deletions(-) delete mode 100644 message/output/popup/db/events.php delete mode 100644 message/output/popup/db/install.xml diff --git a/message/output/popup/classes/api.php b/message/output/popup/classes/api.php index 5592f40420d..775d25e5ef5 100644 --- a/message/output/popup/classes/api.php +++ b/message/output/popup/classes/api.php @@ -79,8 +79,7 @@ class api { n.contexturlname, n.timecreated, n.component, n.eventtype, n.timeread FROM {notifications} n - WHERE n.id IN (SELECT messageid FROM {message_popup}) - AND n.useridto = :useridto1 + WHERE n.useridto = :useridto1 ORDER BY timecreated $sort, timeread $sort, id $sort"; $notifications = []; @@ -110,8 +109,8 @@ class api { return $DB->count_records_sql( "SELECT count(id) FROM {notifications} - WHERE id IN (SELECT messageid FROM {message_popup} WHERE isread = 0) - AND useridto = ?", + WHERE useridto = ? + AND timeread is NULL", [$useridto] ); } diff --git a/message/output/popup/db/events.php b/message/output/popup/db/events.php deleted file mode 100644 index b16846055b3..00000000000 --- a/message/output/popup/db/events.php +++ /dev/null @@ -1,36 +0,0 @@ -. - -/** - * Event observers definition. - * - * @package message_popup - * @category event - * @copyright 2016 Ryan Wyllie - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -$observers = array( - - // Notification viewed. - array( - 'eventname' => '\core\event\notification_viewed', - 'callback' => 'message_output_popup::notification_viewed', - 'includefile' => '/message/output/popup/message_output_popup.php' - ) -); diff --git a/message/output/popup/db/install.xml b/message/output/popup/db/install.xml deleted file mode 100644 index 6a92e563b01..00000000000 --- a/message/output/popup/db/install.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index 455d89a4d78..26f3b1e5484 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -83,5 +83,16 @@ function xmldb_message_popup_upgrade($oldversion) { // Automatically generated Moodle v3.4.0 release upgrade line. // Put any upgrade step following this. + if ($oldversion < 2018022000) { + // Drop table that is no longer needed. + $table = new xmldb_table('message_popup'); + if ($dbman->table_exists($table)) { + $dbman->drop_table($table); + } + + // Popup savepoint reached. + upgrade_plugin_savepoint(true, 2018022000, 'message', 'popup'); + } + return true; } diff --git a/message/output/popup/message_output_popup.php b/message/output/popup/message_output_popup.php index af35d54d128..33065ee4c13 100644 --- a/message/output/popup/message_output_popup.php +++ b/message/output/popup/message_output_popup.php @@ -59,16 +59,6 @@ class message_output_popup extends message_output { //save this message for later delivery $DB->insert_record('message_working', $procmessage); - - if ($eventdata->notification) { - if (!$DB->record_exists('message_popup', ['messageid' => $eventdata->savedmessageid, 'isread' => 0])) { - $record = new StdClass(); - $record->messageid = $eventdata->savedmessageid; - $record->isread = 0; - - $DB->insert_record('message_popup', $record); - } - } } return true; @@ -114,20 +104,6 @@ class message_output_popup extends message_output { return false; } - /** - * Handles the notification_viewed event to keep data in sync. - * - * @param \core\event\base $event The event data - */ - public static function notification_viewed(\core\event\base $event) { - global $DB; - - if ($record = $DB->get_record('message_popup', ['messageid' => $event->objectid])) { - $record->isread = 1; - $DB->update_record('message_popup', $record); - } - } - /** * Determines if this processor should process a message regardless of user preferences or site settings. * diff --git a/message/output/popup/tests/base.php b/message/output/popup/tests/base.php index 9709ad5f4e3..338a6c0f9b1 100644 --- a/message/output/popup/tests/base.php +++ b/message/output/popup/tests/base.php @@ -50,15 +50,7 @@ trait message_popup_test_helper { $record->smallmessage = $message; $record->timecreated = $timecreated ? $timecreated : time(); - $id = $DB->insert_record('notifications', $record); - - $popup = new stdClass(); - $popup->messageid = $id; - $popup->isread = 0; - - $DB->insert_record('message_popup', $popup); - - return $id; + return $DB->insert_record('notifications', $record); } /** @@ -94,12 +86,6 @@ trait message_popup_test_helper { // Mark it as read. \core_message\api::mark_notification_as_read($record); - $popup = new stdClass(); - $popup->messageid = $record->id; - $popup->isread = 1; - - $DB->insert_record('message_popup', $popup); - return $record->id; } } diff --git a/message/output/popup/version.php b/message/output/popup/version.php index 1744c7894e9..048daf73109 100644 --- a/message/output/popup/version.php +++ b/message/output/popup/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2018020500; // The current plugin version (Date: YYYYMMDDXX) +$plugin->version = 2018022000; // The current plugin version (Date: YYYYMMDDXX) $plugin->requires = 2017110800; // Requires this Moodle version $plugin->component = 'message_popup'; // Full name of the plugin (used for diagnostics) -- 2.43.0