Skip to content

Revert "Add Docker Support and Makefile for Development, Linting, and Fixing" #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

Revert "Add Docker Support and Makefile for Development, Linting, and Fixing" #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/moodle-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.1', '8.3']
php: ['7.4', '8.1', '8.3']
moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_404_STABLE']
database: [pgsql, mariadb]

Expand Down
10 changes: 0 additions & 10 deletions .gitignore
View file
Open in desktop

This file was deleted.

122 changes: 0 additions & 122 deletions Makefile
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions aicc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

$cfgexescorm = get_config('exescorm');

$url = new moodle_url('/mod/exescorm/aicc.php', ['command' => $command, 'session_id' => $sessionid]);
$url = new moodle_url('/mod/exescorm/aicc.php', array('command' => $command, 'session_id' => $sessionid));
if ($aiccdata !== 0) {
$url->param('aicc_data', $aiccdata);
}
Expand All @@ -57,7 +57,7 @@
if (empty($exescormsession)) {
throw new \moodle_exception('invalidhacpsession', 'exescorm');
}
$aiccuser = $DB->get_record('user', ['id' => $exescormsession->userid], 'id,username,lastname,firstname', MUST_EXIST);
$aiccuser = $DB->get_record('user', array('id' => $exescormsession->userid), 'id,username,lastname,firstname', MUST_EXIST);
}

if (!empty($command)) {
Expand All @@ -83,7 +83,7 @@
}

if ($sco = exescorm_get_sco($scoid, EXESCORM_SCO_ONLY)) {
if (!$exescorm = $DB->get_record('exescorm', ['id' => $sco->exescorm])) {
if (!$exescorm = $DB->get_record('exescorm', array('id' => $sco->exescorm))) {
throw new \moodle_exception('cannotcallscript');
}
} else {
Expand All @@ -99,7 +99,7 @@
exescorm_debug_log_write("aicc", "HACP Request:\r\n$aiccrequest", $scoid);
ob_start();

if ($exescorm = $DB->get_record('exescorm', ['id' => $sco->exescorm])) {
if ($exescorm = $DB->get_record('exescorm', array('id' => $sco->exescorm))) {
switch ($command) {
case 'getparam':
if ($status == 'Not Initialized') {
Expand Down Expand Up @@ -233,7 +233,7 @@
$attempt, $element, $value);
break;
case 'cmi.core.lesson_status':
$statuses = [
$statuses = array(
'passed' => 'passed',
'completed' => 'completed',
'failed' => 'failed',
Expand All @@ -245,16 +245,16 @@
'f' => 'failed',
'i' => 'incomplete',
'b' => 'browsed',
'n' => 'not attempted',
];
$exites = [
'n' => 'not attempted'
);
$exites = array(
'logout' => 'logout',
'time-out' => 'time-out',
'suspend' => 'suspend',
'l' => 'logout',
't' => 'time-out',
's' => 'suspend',
];
);
$values = explode(',', $value);
$value = '';
if (count($values) > 1) {
Expand Down Expand Up @@ -402,11 +402,11 @@
case 'exitau':
if ($status == 'Running') {
if (isset($exescormsession->sessiontime) && ($exescormsession->sessiontime != '')) {
if ($track = $DB->get_record('exescorm_scoes_track', ["userid" => $aiccuser->id,
if ($track = $DB->get_record('exescorm_scoes_track', array("userid" => $aiccuser->id,
"exescormid" => $exescorm->id,
"scoid" => $sco->id,
"attempt" => $attempt,
"element" => 'cmi.core.total_time'])) {
"element" => 'cmi.core.total_time'))) {
// Add session_time to total_time.
$value = exescorm_add_time($track->value, $exescormsession->sessiontime);
$track->value = $value;
Expand Down
1 change: 0 additions & 1 deletion amd/src/fullscreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ define([
'core/templates'
], function($, Str, Ajax, Templates) {
"use strict";
/* eslint-disable no-console */
/**
* @constructor
*/
Expand Down
60 changes: 30 additions & 30 deletions backup/moodle2/backup_exescorm_stepslib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected function define_structure() {
$userinfo = $this->get_setting_value('userinfo');

// Define each element separated.
$exescorm = new backup_nested_element('exescorm', ['id'], [
$exescorm = new backup_nested_element('exescorm', array('id'), array(
'name', 'exescormtype', 'reference', 'intro',
'introformat', 'version', 'maxgrade', 'grademethod',
'whatgrade', 'maxattempt', 'forcecompleted', 'forcenewattempt',
Expand All @@ -47,56 +47,56 @@ protected function define_structure() {
'height', 'timeopen', 'timeclose', 'timemodified',
'completionstatusrequired', 'completionscorerequired',
'completionstatusallscos',
'autocommit']);
'autocommit'));

$scoes = new backup_nested_element('scoes');

$sco = new backup_nested_element('sco', ['id'], [
$sco = new backup_nested_element('sco', array('id'), array(
'manifest', 'organization', 'parent', 'identifier',
'launch', 'exescormtype', 'title', 'sortorder']);
'launch', 'exescormtype', 'title', 'sortorder'));

$scodatas = new backup_nested_element('sco_datas');

$scodata = new backup_nested_element('sco_data', ['id'], [
'name', 'value']);
$scodata = new backup_nested_element('sco_data', array('id'), array(
'name', 'value'));

$seqruleconds = new backup_nested_element('seq_ruleconds');

$seqrulecond = new backup_nested_element('seq_rulecond', ['id'], [
'conditioncombination', 'ruletype', 'action']);
$seqrulecond = new backup_nested_element('seq_rulecond', array('id'), array(
'conditioncombination', 'ruletype', 'action'));

$seqrulecondsdatas = new backup_nested_element('seq_rulecond_datas');

$seqrulecondsdata = new backup_nested_element('seq_rulecond_data', ['id'], [
'refrencedobjective', 'measurethreshold', 'operator', 'cond']);
$seqrulecondsdata = new backup_nested_element('seq_rulecond_data', array('id'), array(
'refrencedobjective', 'measurethreshold', 'operator', 'cond'));

$seqrolluprules = new backup_nested_element('seq_rolluprules');

$seqrolluprule = new backup_nested_element('seq_rolluprule', ['id'], [
$seqrolluprule = new backup_nested_element('seq_rolluprule', array('id'), array(
'childactivityset', 'minimumcount', 'minimumpercent', 'conditioncombination',
'action']);
'action'));

$seqrollupruleconds = new backup_nested_element('seq_rllprlconds');

$seqrolluprulecond = new backup_nested_element('seq_rllprlcond', ['id'], [
'cond', 'operator']);
$seqrolluprulecond = new backup_nested_element('seq_rllprlcond', array('id'), array(
'cond', 'operator'));

$seqobjectives = new backup_nested_element('seq_objectives');

$seqobjective = new backup_nested_element('seq_objective', ['id'], [
'primaryobj', 'objectiveid', 'satisfiedbymeasure', 'minnormalizedmeasure']);
$seqobjective = new backup_nested_element('seq_objective', array('id'), array(
'primaryobj', 'objectiveid', 'satisfiedbymeasure', 'minnormalizedmeasure'));

$seqmapinfos = new backup_nested_element('seq_mapinfos');

$seqmapinfo = new backup_nested_element('seq_mapinfo', ['id'], [
$seqmapinfo = new backup_nested_element('seq_mapinfo', array('id'), array(
'targetobjectiveid', 'readsatisfiedstatus', 'readnormalizedmeasure', 'writesatisfiedstatus',
'writenormalizedmeasure']);
'writenormalizedmeasure'));

$scotracks = new backup_nested_element('sco_tracks');

$scotrack = new backup_nested_element('sco_track', ['id'], [
$scotrack = new backup_nested_element('sco_track', array('id'), array(
'userid', 'attempt', 'element', 'value',
'timemodified']);
'timemodified'));

// Build the tree.
$exescorm->add_child($scoes);
Expand Down Expand Up @@ -127,24 +127,24 @@ protected function define_structure() {
$scotracks->add_child($scotrack);

// Define sources.
$exescorm->set_source_table('exescorm', ['id' => backup::VAR_ACTIVITYID]);
$exescorm->set_source_table('exescorm', array('id' => backup::VAR_ACTIVITYID));

// Order is important for several EXESCORM calls (especially exescorm_scoes)
// in the following calls to set_source_table.
$sco->set_source_table('exescorm_scoes', ['exescorm' => backup::VAR_PARENTID], 'sortorder, id');
$scodata->set_source_table('exescorm_scoes_data', ['scoid' => backup::VAR_PARENTID], 'id ASC');
$seqrulecond->set_source_table('exescorm_seq_ruleconds', ['scoid' => backup::VAR_PARENTID], 'id ASC');
$sco->set_source_table('exescorm_scoes', array('exescorm' => backup::VAR_PARENTID), 'sortorder, id');
$scodata->set_source_table('exescorm_scoes_data', array('scoid' => backup::VAR_PARENTID), 'id ASC');
$seqrulecond->set_source_table('exescorm_seq_ruleconds', array('scoid' => backup::VAR_PARENTID), 'id ASC');
$seqrulecondsdata->set_source_table(
'exescorm_seq_rulecond', ['ruleconditionsid' => backup::VAR_PARENTID], 'id ASC'
'exescorm_seq_rulecond', array('ruleconditionsid' => backup::VAR_PARENTID), 'id ASC'
);
$seqrolluprule->set_source_table('exescorm_seq_rolluprule', ['scoid' => backup::VAR_PARENTID], 'id ASC');
$seqrolluprulecond->set_source_table('exescorm_seq_rllprlcond', ['rollupruleid' => backup::VAR_PARENTID], 'id ASC');
$seqobjective->set_source_table('exescorm_seq_objective', ['scoid' => backup::VAR_PARENTID], 'id ASC');
$seqmapinfo->set_source_table('exescorm_seq_mapinfo', ['objectiveid' => backup::VAR_PARENTID], 'id ASC');
$seqrolluprule->set_source_table('exescorm_seq_rolluprule', array('scoid' => backup::VAR_PARENTID), 'id ASC');
$seqrolluprulecond->set_source_table('exescorm_seq_rllprlcond', array('rollupruleid' => backup::VAR_PARENTID), 'id ASC');
$seqobjective->set_source_table('exescorm_seq_objective', array('scoid' => backup::VAR_PARENTID), 'id ASC');
$seqmapinfo->set_source_table('exescorm_seq_mapinfo', array('objectiveid' => backup::VAR_PARENTID), 'id ASC');

// All the rest of elements only happen if we are including user info.
if ($userinfo) {
$scotrack->set_source_table('exescorm_scoes_track', ['scoid' => backup::VAR_PARENTID], 'id ASC');
$scotrack->set_source_table('exescorm_scoes_track', array('scoid' => backup::VAR_PARENTID), 'id ASC');
}

// Define id annotations.
Expand Down
Loading
Loading