diff --git a/classes/events.php b/classes/events.php index 5dfb0cf..33e278b 100644 --- a/classes/events.php +++ b/classes/events.php @@ -59,13 +59,29 @@ class events { if ($callbacks->valid()) { foreach ($callbacks as $callback) { - self::send($data, $callback); + self::handler_callback($data, $callback); } } $callbacks->close(); } + /** + * Processes each callback. + * + * @param array $data + * @param object $callback + */ + private static function handler_callback($data, $callback) { + if ($callback->enable) { + $events = unserialize(gzuncompress(base64_decode($callback->events))); + + if (boolval($events[$data["eventname"]])) { + self::send($data, $callback); + } + } + } + /** * Sending data to the node. * @@ -73,11 +89,9 @@ class events { * @param object $callback */ private static function send($data, $callback) { - if ($callback->enable) { - $curl = new curl(); - $package = self::packup($data); - $curl::request($callback->url, $package); - } + $curl = new curl(); + $package = self::packup($data); + $curl::request($callback->url, $package); } /** diff --git a/classes/forms.php b/classes/forms.php index c95b280..d6402cc 100644 --- a/classes/forms.php +++ b/classes/forms.php @@ -28,6 +28,7 @@ defined("MOODLE_INTERNAL") || die(); require_once($CFG->libdir . "/formslib.php"); +use report_eventlist_list_generator; use lang_string; use moodleform; @@ -45,6 +46,16 @@ class service_edit_form extends moodleform { parent::__construct($baseurl); } + /** + * Unpacks data for display. + * + * @param object $record + */ + public function set_data($record) { + $record->events = unserialize(gzuncompress(base64_decode($record->events))); + return parent::set_data($record); + } + /** * Defines the standard structure of the form. */ @@ -76,6 +87,25 @@ class service_edit_form extends moodleform { $mform->setDefault("enable", 1); $mform->setAdvanced("enable"); + /* Form heading */ + $mform->addElement("header", "editserviceheaderevent", + new lang_string("edulevel", "moodle")); + + /* List of events */ + $eventlist = report_eventlist_list_generator::get_all_events_list(true); + $events = array(); + + /* Formation of the list of elements */ + foreach ($eventlist as $event) { + $events[$event["component"]][] =& + $mform->createElement("advcheckbox", $event["eventname"], $event["eventname"]); + } + + /* Displays groups of items */ + foreach ($events as $key => $event) { + $mform->addGroup($event, "events", $key, "
", true); + } + /* Control Panel */ $this->add_action_buttons(true); } diff --git a/db/install.xml b/db/install.xml index b152933..f2e5b05 100644 --- a/db/install.xml +++ b/db/install.xml @@ -1,5 +1,5 @@ - + @@ -7,6 +7,7 @@ + diff --git a/editservice.php b/editservice.php index e9c053c..427332c 100644 --- a/editservice.php +++ b/editservice.php @@ -63,6 +63,9 @@ if ($data = $mform->get_data()) { $data->enable = 0; } + /* Packing of data */ + $data->events = base64_encode(gzcompress(serialize($data->events), 9)); + if ($idediting) { $data->id = $idservice; $DB->update_record("local_webhooks_service", $data);