Skip to content

Commit 69382ff

Browse files
TamaroWalterTamaroWalter
committed
run codechecker
1 parent 9156c22 commit 69382ff

30 files changed

+1423
-935
lines changed

‎cal_import.php‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?php
2+
// This file is part of Moodle - https://moodle.org/
3+
//
4+
// Moodle is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// Moodle is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
16+
217
/**
318
* This page adds a hislsf calendar instance to the users calendars. It is accessible from the manage_calendars site.
419
* To limit the changes to original moodle-files, the call of his_add_cal() is done here.
@@ -11,4 +26,4 @@
1126
$url->param('back', $back);
1227
$PAGE->set_url($url);
1328
his_add_cal();
14-
redirect($back);
29+
redirect($back);

‎cal_lib.php‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,41 @@
11
<?php
2+
// This file is part of Moodle - https://moodle.org/
3+
//
4+
// Moodle is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// Moodle is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
16+
217
/**
318
* Functions for creating hislsf calendar instances
419
*/
520
if (!defined('MOODLE_INTERNAL')) {
6-
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
21+
die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
722
}
823

924
define("HIS_CAL_IDENTIFIER", "hislsf");
1025

11-
require_once($CFG->dirroot.'/calendar/lib.php');
12-
require_once($CFG->libdir.'/bennu/bennu.inc.php');
26+
require_once($CFG->dirroot . '/calendar/lib.php');
27+
require_once($CFG->libdir . '/bennu/bennu.inc.php');
1328

1429
/**
1530
* Returns the CURRENT (because of the event ids instead of the user id being appended this URL changes when users subscribe to new events) userspecific ICal-URL
1631
* @param unknown_type $userid
1732
*/
1833
function his_get_ical_url($userid) {
1934
global $DB, $CFG;
20-
require_once($CFG->dirroot.'/local/lsf_unification/lib_his.php');
21-
$user = $DB->get_record("user" ,array("id" => $userid));
22-
$terminidstring = implode(",",get_students_stdp_terminids($user->idnumber));
23-
return get_config('local_lsf_unification', 'icalurl').$terminidstring;
35+
require_once($CFG->dirroot . '/local/lsf_unification/lib_his.php');
36+
$user = $DB->get_record("user", ["id" => $userid]);
37+
$terminidstring = implode(",", get_students_stdp_terminids($user->idnumber));
38+
return get_config('local_lsf_unification', 'icalurl') . $terminidstring;
2439
}
2540

2641
/**
@@ -42,7 +57,9 @@ function create_default_his_subscription() {
4257
*/
4358
function his_add_cal() {
4459
global $PAGE;
45-
if (his_already_imported_cal()) return;
60+
if (his_already_imported_cal()) {
61+
return;
62+
}
4663
$sub = create_default_his_subscription();
4764
$subscriptionid = calendar_add_subscription($sub);
4865
try {
@@ -60,7 +77,7 @@ function his_add_cal() {
6077
*/
6178
function his_already_imported_cal() {
6279
global $USER, $DB;
63-
return $DB->record_exists('event_subscriptions', array("userid" => $USER->id, "url" => HIS_CAL_IDENTIFIER));
80+
return $DB->record_exists('event_subscriptions', ["userid" => $USER->id, "url" => HIS_CAL_IDENTIFIER]);
6481
}
6582

6683
/**
@@ -69,8 +86,12 @@ function his_already_imported_cal() {
6986
*/
7087
function his_print_cal_import_form($mform) {
7188
global $PAGE, $CFG;
72-
if (his_already_imported_cal()) return;
73-
if (getSSONo() < 0) return;
89+
if (his_already_imported_cal()) {
90+
return;
91+
}
92+
if (getSSONo() < 0) {
93+
return;
94+
}
7495
$mform->addElement('header', 'addhissubscriptionform', get_string('importcalendar', 'local_lsf_unification'));
75-
$mform->addElement('html', '<a class="btn" href="'.$CFG->wwwroot.'/local/lsf_unification/cal_import.php?back='.urlencode($PAGE->url).'">'.get_string('importical', 'local_lsf_unification').'</a>');
76-
}
96+
$mform->addElement('html', '<a class="btn" href="' . $CFG->wwwroot . '/local/lsf_unification/cal_import.php?back=' . urlencode($PAGE->url) . '">' . get_string('importical', 'local_lsf_unification') . '</a>');
97+
}

‎class_pg_lite.php‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
11
<?php
2+
// This file is part of Moodle - https://moodle.org/
3+
//
4+
// Moodle is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// Moodle is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
16+
217
defined('MOODLE_INTERNAL') || die;
318

419
class pg_lite {
5-
620
public $connection = null;
721

822
public function connect() {
9-
$config = "host='".get_config('local_lsf_unification', 'dbhost')."' port ='".get_config('local_lsf_unification', 'dbport')."' user='".get_config('local_lsf_unification', 'dbuser')."' password='".get_config('local_lsf_unification', 'dbpass')."' dbname='".get_config('local_lsf_unification', 'dbname')."'";
23+
$config = "host='" . get_config('local_lsf_unification', 'dbhost') . "' port ='" . get_config('local_lsf_unification', 'dbport') . "' user='" . get_config('local_lsf_unification', 'dbuser') . "' password='" . get_config('local_lsf_unification', 'dbpass') . "' dbname='" . get_config('local_lsf_unification', 'dbname') . "'";
1024
ob_start();
1125
$this->connection = pg_connect($config, PGSQL_CONNECT_FORCE_NEW);
1226
$dberr = ob_get_contents();
1327
ob_end_clean();
1428
echo $dberr;
15-
return ((pg_connection_status($this->connection) === false) || (pg_connection_status($this->connection) === PGSQL_CONNECTION_BAD))?$dberr:true;
29+
return ((pg_connection_status($this->connection) === false) || (pg_connection_status($this->connection) === PGSQL_CONNECTION_BAD)) ? $dberr : true;
1630
}
1731

1832
public function dispose() {
@@ -21,5 +35,4 @@ public function dispose() {
2135
$this->connection = null;
2236
}
2337
}
24-
25-
}
38+
}

‎classes/event/course_duplicated.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
//
1414
// You should have received a copy of the GNU General Public License
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
16-
16+
1717
/**
1818
* The matchingtableupdated event.
1919
*
20-
* @package FULLPLUGINNAME
21-
* @copyright 2014 YOUR NAME
20+
* @package local_lsf_unification
21+
* @copyright 2025 Tamaro Walter
2222
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2323
*/
2424
namespace local_lsf_unification\event;
@@ -36,16 +36,16 @@ protected function init() {
3636
$this->data['edulevel'] = self::LEVEL_TEACHING;
3737
$this->data['objecttable'] = 'course';
3838
}
39-
39+
4040
public static function get_name() {
4141
return get_string('eventcourse_duplicated', 'local_lsf_unification');
4242
}
43-
43+
4444
public function get_description() {
4545
return "The user with id '{$this->userid}' duplicated contents from course with id '{$this->other}' into a course with id '{$this->objectid}'.";
4646
}
47-
47+
4848
public function get_url() {
49-
return new \moodle_url('/course/view.php', array('id' => $this->objectid));
49+
return new \moodle_url('/course/view.php', ['id' => $this->objectid]);
5050
}
5151
}

‎classes/event/course_imported.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
//
1414
// You should have received a copy of the GNU General Public License
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
16-
16+
1717
/**
1818
* The matchingtableupdated event.
1919
*
20-
* @package FULLPLUGINNAME
21-
* @copyright 2014 YOUR NAME
20+
* @package local_lsf_unification
21+
* @copyright 2025 Tamaro Walter
2222
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2323
*/
2424
namespace local_lsf_unification\event;
@@ -36,16 +36,16 @@ protected function init() {
3636
$this->data['edulevel'] = self::LEVEL_TEACHING;
3737
$this->data['objecttable'] = 'course';
3838
}
39-
39+
4040
public static function get_name() {
4141
return get_string('eventcourse_imported', 'local_lsf_unification');
4242
}
43-
43+
4444
public function get_description() {
4545
return "The user with id '{$this->userid}' imported the HISLSF-course with veranstid '{$this->other}' as a new moodle course with id '{$this->objectid}'.";
4646
}
47-
47+
4848
public function get_url() {
49-
return new \moodle_url('/course/view.php', array('id' => $this->objectid));
49+
return new \moodle_url('/course/view.php', ['id' => $this->objectid]);
5050
}
5151
}

‎classes/event/matchingtable_updated.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
//
1414
// You should have received a copy of the GNU General Public License
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
16-
16+
1717
/**
1818
* The matchingtableupdated event.
1919
*
20-
* @package FULLPLUGINNAME
21-
* @copyright 2014 YOUR NAME
20+
* @package local_lsf_unification
21+
* @copyright 2025 Tamaro Walter
2222
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2323
*/
2424
namespace local_lsf_unification\event;
@@ -36,16 +36,16 @@ protected function init() {
3636
$this->data['edulevel'] = self::LEVEL_OTHER;
3737
$this->data['objecttable'] = 'local_lsf_category';
3838
}
39-
39+
4040
public static function get_name() {
4141
return get_string('eventmatchingtable_updated', 'local_lsf_unification');
4242
}
43-
43+
4444
public function get_description() {
4545
return "The user with id '{$this->userid}' updated a his category matching with id '{$this->objectid}'. Original mapping: '{$this->other["mappingold"]}'. New mapping: '{$this->other["mappingnew"]}'.";
4646
}
47-
47+
4848
public function get_url() {
49-
return new \moodle_url('/local/lsf_unification/helptablemanager.php', array('originid' => $this->other["originid"]));
49+
return new \moodle_url('/local/lsf_unification/helptablemanager.php', ['originid' => $this->other["originid"]]);
5050
}
5151
}

‎classes/privacy/provider.php‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* Privacy Implementation for lsf_unification.
1919
*
20-
* @package lsf_unification
20+
* @package local_lsf_unification
2121
* @copyright 2018 Nina Herrmann
2222
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2323
*/
@@ -46,7 +46,7 @@ class provider implements \core_privacy\local\metadata\provider, \core_privacy\l
4646
* @param $collection
4747
* @return mixed
4848
*/
49-
public static function _get_metadata ($collection) {
49+
public static function _get_metadata($collection) {
5050
$collection->add_database_table(
5151
'local_lsf_course',
5252
[
@@ -55,7 +55,7 @@ public static function _get_metadata ($collection) {
5555
'timestamp' => 'privacy:metadata:local_lsf_unification:timestamp',
5656
'requeststate' => 'privacy:metadata:local_lsf_unification:requeststate',
5757
'requesterid' => 'privacy:metadata:local_lsf_unification:requesterid',
58-
'acceptorid' => 'privacy:metadata:local_lsf_unification:acceptorid'
58+
'acceptorid' => 'privacy:metadata:local_lsf_unification:acceptorid',
5959

6060
],
6161
'privacy:metadata:local_lsf_unification'
@@ -69,7 +69,7 @@ public static function _get_metadata ($collection) {
6969
* @return contextlist $contextlist The list of contexts for a specific user.
7070
* @throws \dml_exception
7171
*/
72-
public static function _get_contexts_for_userid ($userid) {
72+
public static function _get_contexts_for_userid($userid) {
7373
global $DB;
7474
$contextlist = new contextlist();
7575

@@ -133,7 +133,7 @@ public static function _export_user_data(approved_contextlist $contextlist) {
133133
}
134134
}
135135
$subcontext = [
136-
get_string('pluginname', 'local_lsf_unification')
136+
get_string('pluginname', 'local_lsf_unification'),
137137
];
138138
if (!empty($contextdatatowrite)) {
139139
writer::with_context($context)->export_data($subcontext, (object)$contextdatatowrite);
@@ -154,14 +154,14 @@ private function create_data_to_write($action, $courserequest, $username) {
154154
global $DB;
155155
$status = '';
156156
switch ($courserequest->requeststate) {
157-
case 0 :
157+
case 0:
158158
$status = "is declined or not requested";
159159
break;
160-
case 1 :
160+
case 1:
161161
$status =
162162
"is waiting";
163163
break;
164-
case 2 :
164+
case 2:
165165
$status =
166166
"is granted";
167167
break;
@@ -170,10 +170,10 @@ private function create_data_to_write($action, $courserequest, $username) {
170170
'action' => get_string('privacy:local_lsf_unification:' . $action, 'local_lsf_unification'),
171171
'timestamp' => date('c', $courserequest->timestamp),
172172
'username' => $username,
173-
'status' => $status
173+
'status' => $status,
174174
];
175175
// In case the course exist we add the name to the information.
176-
$course = $DB->get_record('course', array('id' => $courserequest->mdlid));
176+
$course = $DB->get_record('course', ['id' => $courserequest->mdlid]);
177177
if (!empty($course)) {
178178
$data->coursename = $course->fullname;
179179
}
@@ -194,10 +194,10 @@ public static function _delete_data_for_all_users_in_context($context) {
194194
return;
195195
}
196196
// Sanity check that context is at the User context level.
197-
if ($context->contextlevel == CONTEXT_USER ) {
197+
if ($context->contextlevel == CONTEXT_USER) {
198198
$userid = $context->instanceid;
199-
$DB->delete_records("local_lsf_course", array('acceptorid' => $userid));
200-
$DB->delete_records("local_lsf_course", array('requesterid' => $userid));
199+
$DB->delete_records("local_lsf_course", ['acceptorid' => $userid]);
200+
$DB->delete_records("local_lsf_course", ['requesterid' => $userid]);
201201
}
202202
}
203203

@@ -214,15 +214,14 @@ public static function _delete_data_for_user($contextlist) {
214214
}
215215

216216
foreach ($contexts as $context) {
217-
218217
// Sanity check that context is at the User context level, then get the userid.
219218
if ($context->contextlevel !== CONTEXT_USER) {
220219
continue;
221220
}
222221

223222
$userid = $context->instanceid;
224-
$DB->delete_records("local_lsf_course", array('acceptorid' => $userid));
225-
$DB->delete_records("local_lsf_course", array('requesterid' => $userid));
223+
$DB->delete_records("local_lsf_course", ['acceptorid' => $userid]);
224+
$DB->delete_records("local_lsf_course", ['requesterid' => $userid]);
226225
}
227226
}
228-
}
227+
}

0 commit comments

Comments
 (0)