Aesthetics in the code

This commit is contained in:
2017-11-18 06:31:25 +04:00
parent bf2cef3ea0
commit 97140dccf7
8 changed files with 43 additions and 38 deletions

View File

@ -28,9 +28,9 @@ defined("MOODLE_INTERNAL") || die();
require_once($CFG->libdir . "/formslib.php"); require_once($CFG->libdir . "/formslib.php");
use report_eventlist_list_generator;
use lang_string; use lang_string;
use moodleform; use moodleform;
use report_eventlist_list_generator;
/** /**
* Description editing form definition. * Description editing form definition.

View File

@ -37,9 +37,9 @@ class response_get extends \core\event\base {
* Init method. * Init method.
*/ */
protected function init() { protected function init() {
$this->data["crud"] = "u"; $this->data["crud"] = "r";
$this->data["objecttable"] = "local_webhooks_service";
$this->data["edulevel"] = self::LEVEL_OTHER; $this->data["edulevel"] = self::LEVEL_OTHER;
$this->data["objecttable"] = "local_webhooks_service";
} }
/** /**

View File

@ -125,7 +125,8 @@ class handler {
"other" => array( "other" => array(
"status" => $status "status" => $status
) )
)); )
);
$event->trigger(); $event->trigger();
} }

View File

@ -26,10 +26,10 @@ defined("MOODLE_INTERNAL") || die();
$observers = array( $observers = array(
array( array(
"eventname" => "*",
"callback" => "\local_webhooks\\handler::events", "callback" => "\local_webhooks\\handler::events",
"eventname" => "*",
"includefile" => null, "includefile" => null,
"priority" => 200, "internal" => true,
"internal" => true "priority" => 200
) )
); );

View File

@ -27,11 +27,11 @@ require_once(__DIR__ . "/classes/editform.php");
require_once($CFG->libdir . "/adminlib.php"); require_once($CFG->libdir . "/adminlib.php");
admin_externalpage_setup("pluginsoverview"); admin_externalpage_setup("pluginsoverview");
$serviceid = optional_param("serviceid", 0, PARAM_INT);
require_login(); require_login();
/* Optional parameters */
$serviceid = optional_param("serviceid", 0, PARAM_INT);
/* Link generation */ /* Link generation */
$urlparameters = array("serviceid" => $serviceid); $urlparameters = array("serviceid" => $serviceid);
$managerservice = new moodle_url("/local/webhooks/managerservice.php", $urlparameters); $managerservice = new moodle_url("/local/webhooks/managerservice.php", $urlparameters);
@ -62,10 +62,13 @@ if ($editing = boolval($serviceid)) {
/* Processing of received data */ /* Processing of received data */
if ($data = $mform->get_data()) { if ($data = $mform->get_data()) {
if (!empty($data->events)) { if (empty($data->events)) {
$data->events = base64_encode(gzcompress(serialize($data->events), 9)); $data->events = array();
} }
/* Pack the list of events */
$data->events = base64_encode(gzcompress(serialize($data->events), 9));
if ($editing) { if ($editing) {
$data->id = $serviceid; $data->id = $serviceid;
$DB->update_record("local_webhooks_service", $data); $DB->update_record("local_webhooks_service", $data);
@ -82,7 +85,7 @@ $PAGE->set_heading($titlepage);
$PAGE->set_title($titlepage); $PAGE->set_title($titlepage);
/* The page title */ /* The page title */
$PAGE->navbar->add(new lang_string("externalservices", "webservice"), $managerservice); $PAGE->navbar->add(new lang_string("pluginname", "local_webhooks"), $managerservice);
$PAGE->navbar->add($titlepage); $PAGE->navbar->add($titlepage);
echo $OUTPUT->header(); echo $OUTPUT->header();

View File

@ -27,13 +27,14 @@ require_once($CFG->libdir . "/tablelib.php");
require_once($CFG->libdir . "/adminlib.php"); require_once($CFG->libdir . "/adminlib.php");
admin_externalpage_setup("pluginsoverview"); admin_externalpage_setup("pluginsoverview");
require_login();
$backupservices = optional_param("backup", 0, PARAM_BOOL); /* Optional parameters */
$backupservices = optional_param("getbackup", 0, PARAM_BOOL);
$deleteid = optional_param("deleteid", 0, PARAM_INT); $deleteid = optional_param("deleteid", 0, PARAM_INT);
$hideshowid = optional_param("hideshowid", 0, PARAM_INT); $hideshowid = optional_param("hideshowid", 0, PARAM_INT);
require_login(); /* Used references */
$editservice = "/local/webhooks/editservice.php"; $editservice = "/local/webhooks/editservice.php";
$managerservice = "/local/webhooks/managerservice.php"; $managerservice = "/local/webhooks/managerservice.php";
$restorebackup = "/local/webhooks/restorebackup.php"; $restorebackup = "/local/webhooks/restorebackup.php";
@ -74,7 +75,7 @@ if (boolval($hideshowid) && confirm_sesskey()) {
} }
/* Page template */ /* Page template */
$titlepage = new lang_string("externalservices", "webservice"); $titlepage = new lang_string("pluginname", "local_webhooks");
$PAGE->set_pagelayout("admin"); $PAGE->set_pagelayout("admin");
$PAGE->set_title($titlepage); $PAGE->set_title($titlepage);
$PAGE->set_heading($titlepage); $PAGE->set_heading($titlepage);
@ -125,11 +126,11 @@ foreach ($callbacks as $callback) {
$table->print_html(); $table->print_html();
/* Add service button */ /* Add service button */
$addurl = new moodle_url($editservice); $addserviceurl = new moodle_url($editservice);
echo $OUTPUT->single_button($addurl, new lang_string("addaservice", "webservice"), "get"); echo $OUTPUT->single_button($addserviceurl, new lang_string("addaservice", "webservice"), "get");
/* Button to get a backup */ /* Button to get a backup */
$backupurl = new moodle_url($managerservice, array("backup" => true)); $backupurl = new moodle_url($managerservice, array("getbackup" => true));
echo $OUTPUT->single_button($backupurl, new lang_string("backup", "moodle"), "get"); echo $OUTPUT->single_button($backupurl, new lang_string("backup", "moodle"), "get");
/* Button for restoring settings */ /* Button for restoring settings */

View File

@ -67,7 +67,7 @@ $PAGE->set_heading($titlepage);
$PAGE->set_title($titlepage); $PAGE->set_title($titlepage);
/* The page title */ /* The page title */
$PAGE->navbar->add(new lang_string("externalservices", "webservice"), $managerservice); $PAGE->navbar->add(new lang_string("pluginname", "local_webhooks"), $managerservice);
$PAGE->navbar->add($titlepage); $PAGE->navbar->add($titlepage);
echo $OUTPUT->header(); echo $OUTPUT->header();

View File

@ -26,7 +26,7 @@ defined("MOODLE_INTERNAL") || die();
if ($hassiteconfig) { if ($hassiteconfig) {
$ADMIN->add("server", new admin_externalpage("local_webhooks", $ADMIN->add("server", new admin_externalpage("local_webhooks",
new lang_string("externalservices", "webservice"), new lang_string("pluginname", "local_webhooks"),
new moodle_url("/local/webhooks/managerservice.php") new moodle_url("/local/webhooks/managerservice.php")
)); ));
} }