Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 assets/hardcopyThemes/basic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<description>
This theme produces hardcopies with minimal page headers displaying the set
title and useername, and minimal problem numbering.
title and username, and minimal problem numbering.
</description>

<preamble>
Expand Down
2 changes: 1 addition & 1 deletion assets/hardcopyThemes/basicTwoCol.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<description>
This theme produces hardcopies with minimal page headers displaying the set
title and useername, and minimal problem numbering. With two columns.
title and username, and minimal problem numbering. With two columns.
</description>

<preamble>
Expand Down
4 changes: 2 additions & 2 deletions assets/pg/PGMLLab/PGML-lab.pg
Original file line number Diff line number Diff line change
Expand Up @@ -682,9 +682,9 @@ TEXT(tag(
>> At the right

>> Several lines combined.
>> right justfied
>> right justified

>> Or a whole paragaph
>> Or a whole paragraph
that is pushed to the right

>> Or two lines
Expand Down
2 changes: 1 addition & 1 deletion bin/check_modules.pl
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ sub check_modules {

if ($moduleNotFound) {
say '';
say 'Some requred modules were not found, could not be loaded, or were not at the sufficient version.';
say 'Some required modules were not found, could not be loaded, or were not at the sufficient version.';
say 'Exiting as this is required to check the database driver and programs.';
exit 0;
}
Expand Down
4 changes: 2 additions & 2 deletions bin/dev_scripts/run-perltidy.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ =head1 OPTIONS
# Validate options that were passed.
my %options;
my $err = Perl::Tidy::perltidy(argv => \@args, dump_options => \%options);
exit $err if $err;
die "The -pro option is not suppored by this script.\n" if defined $options{profile};
exit $err if $err;
die "The -pro option is not supported by this script.\n" if defined $options{profile};

unshift(@args, '-bext=/') unless defined $options{'backup-file-extension'};

Expand Down
2 changes: 1 addition & 1 deletion bin/dev_scripts/update-localization-files
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [ -z "$WEBWORK_ROOT" ]; then
fi

command -v xgettext.pl >/dev/null 2>&1 || {
echo >&2 "xgettext.pl needs to be installed. It is inlcuded in the perl package Locale::Maketext::Extract. Aborting.";
echo >&2 "xgettext.pl needs to be installed. It is included in the perl package Locale::Maketext::Extract. Aborting.";
exit 1;
}

Expand Down
2 changes: 1 addition & 1 deletion bin/upgrade-database-to-utf8mb4.pl
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ =head1 OPTIONS
this option is enabled then the second pass will change those back to the
smaller text datatypes as defined in the webwork database schema.

This second pass is not strictly neccessary. The larger text datatypes should
This second pass is not strictly necessary. The larger text datatypes should
still work with WeBWorK.

This pass is not run by default. Note that running this script again will also
Expand Down
2 changes: 1 addition & 1 deletion conf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ sudo systemctl enable /opt/webwork/webwork2/conf/webwork2.service
sudo systemctl start webwork2
```

### Deployment of the webwork2 job queue for all server arrangments
### Deployment of the webwork2 job queue for all server arrangements

Some long running processes are not directly run by the webwork2 Mojolicious app. Particularly mass grade updates via
LTI and sending of instructor emails. Instead these tasks are executed via the webwork2 Minion job queue.
Expand Down
2 changes: 1 addition & 1 deletion conf/authen_saml2.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $saml2{twoFAOnlyWithBypass} = 0;
# prevents users from attempting to login in to WeBWorK directly.
$external_auth = 0;

# The $saml2{idps} hash contains names of identity proviers and their SAML2
# The $saml2{idps} hash contains names of identity providers and their SAML2
# metadata URLs that are used by this server. Webwork will request the identity
# provider's metadata from the URL of the $saml2{active_idp} during the
# authentication process. Additional identity providers can also be added for a
Expand Down
8 changes: 4 additions & 4 deletions conf/defaults.config
Original file line number Diff line number Diff line change
Expand Up @@ -674,14 +674,14 @@ $courseFiles{logs}{activity_log} = '';
# The default_copy_from_course is used by default when creating a new course.
# Its templates folder, html folder, course.conf file, and simple.conf file
# might be copied into a new course. This course might not be a true course;
# it might only have a directory structure and no presense in the database.
# it might only have a directory structure and no presence in the database.
# If it is a real course, then also its title, institution, non-student users,
# achievements, and sets can be copied.
$siteDefaults{default_copy_from_course} ="modelCourse";

# Provide a list of model courses which are not real courses, but from which
# the templates for a new course can be copied. This list helps exclude such
# non-real courses when that is appopriate.
# non-real courses when that is appropriate.
$modelCoursesForCopy = [ "modelCourse" ];

################################################################################
Expand Down Expand Up @@ -917,7 +917,7 @@ $gatewayGracePeriod = 120;
# database which is compared to the key stored in the session cookie. The
# lifetime of the cookie is determined by the $sessionTimeout setting above.

# Note that the key database method is less secure as the key must be embeded in
# Note that the key database method is less secure as the key must be embedded in
# the page and added as a url parameter in order to maintain the session. These
# things can be accessed by malicious javascript. The session cookies are http
# only cookies which can not be accessed via javascript.
Expand Down Expand Up @@ -1109,7 +1109,7 @@ $pg{options}{showPGInfo} = 0;
$pg{options}{showEvaluatedAnswers} = 1;

# Catch translation warnings internally. This must be done since the translator is now run in a subprocess and do not
# propogate to the main process. So this really should never be set to 0.
# propagate to the main process. So this really should never be set to 0.
$pg{options}{catchWarnings} = 1;

##### Settings for various display modes
Expand Down
6 changes: 3 additions & 3 deletions conf/localOverrides.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $mail{feedbackRecipients} = [
# Should the studentID be included in the feedback email when feedbackVerbosity > 0:
# The default is yes. Uncomment the line below to block it from being included.
# Blocking it from being included is recommended if the studentID is "personal"
# informations whose privacy should be maintained (ex. a government issued ID number).
# information whose privacy should be maintained (ex. a government issued ID number).
# The setting can also be made in the course.conf file for specific courses.
#$blockStudentIDinFeedback = 1;

Expand Down Expand Up @@ -348,7 +348,7 @@ $mail{feedbackRecipients} = [
# also not present, it will just activate the "Preview My Answers" button.
# A third option is "conservative". In this case, the enter key behaves like "preview"
# when the "Submit" button is available and there are only finitely many
# attempts allowed. Otherise the enter key behaves like "submit".
# attempts allowed. Otherwise the enter key behaves like "submit".
#$pg{options}{enterKey} = 'conservative';

################################################################################
Expand Down Expand Up @@ -558,7 +558,7 @@ $mail{feedbackRecipients} = [
# database which is compared to the key stored in the session cookie. The
# lifetime of the cookie is determined by the $sessionTimeout setting below.

# Note that the key database method is less secure as the key must be embeded in
# Note that the key database method is less secure as the key must be embedded in
# the page and added as a url parameter in order to maintain the session. These
# things can be accessed by malicious javascript. The session cookies are http
# only cookies which can not be accessed via javascript.
Expand Down
6 changes: 3 additions & 3 deletions conf/site.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ if ( $database_host eq "localhost" ) {
$database_dsn="DBI:$database_driver:database=$database_name;host=$database_host;port=$database_port";
}

# The default storange engine to use is set here:
# The default storage engine to use is set here:
$database_storage_engine = 'myisam';

#########################
Expand Down Expand Up @@ -290,7 +290,7 @@ $mail{tls_allowed} = 0;
# Set maxAttachmentSize to the maximum number of megabytes to allow for the size of
# files attached to feedback emails. Note that this should be set to match the
# limitations of the email server chosen above, and should be set to a value greater
# than zero or no attatchments will work. This is not intended to be a configuration
# than zero or no attachments will work. This is not intended to be a configuration
# option to disable attachments.

$mail{maxAttachmentSize} = 10;
Expand All @@ -301,7 +301,7 @@ $mail{maxAttachmentSize} = 10;

# This is the Minion backend that will be used by the job queue.
# The corresponding perl package for this backend must be installed.
# Some availabled backends are:
# Some available backends are:
# Minion::Backend::Pg (use 'Pg' below)
# Minion::Backend::mysql (use 'mysql' below)
# Minion::Backend::SQLite (use 'SQLite' below)
Expand Down
2 changes: 1 addition & 1 deletion conf/webwork2.mojolicious.dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pg_dir: /opt/webwork/pg

# Setting MIN_HTML_ERRORS to 1 will minimize the data provided on HTML error
# pages, which some security reviews request, as in particular the older output
# provided backtrace information which could help idenfify the code and version
# provided backtrace information which could help identify the code and version
# of the code being used on the server. The useful information will be in the
# Mojolicious webwork2.log file, with a UID displayed also in the HTML error
# page to help match up records.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
This folder contains achievement evaluators. Their job is to test
whether or not an achievement has been earned. The code is run every time a
student submits an answer to a homework question as long as the achievement
is unearned.
student submits an answer to a homework question as long as the achievement
is unearned.

-The code should be written in perl and should return 1 if the achievement
was earned and 0 if it was not earned.
-The code should be written in perl and should return 1 if the achievement
was earned and 0 if it was not earned.

-Any perl code in preamble.at will be run before the content of any
achievement evaluator.
achievement evaluator.

You have access to a variety of variables:
- $problem : the problem data (changes to this variable will not be saved!)
Expand All @@ -19,31 +19,31 @@
- $problem->num_correct : the number of correct attempts
- $problem->num_incorrect : the number of incorrect attempts
- $problem->max_attempts : the maximum number of allowed attempts

- $set : the set data (changes to this variable will not be saved!)
This variable contains the set data. it is a hash pointer with the
following values. (not all values shown)
- $set->open_date : when the set was open
- $set->due_date : when the set is due
- @setProblems : the problem data for all the problems from this set.

- @setProblems : the problem data for all the problems from this set.
(changes to this variable will not be saved!)
This is an array of problem hashes. Each element of the array has the
save hash keys as the $problem variable above

- $counter : the users counter associated to this achievement
(changes to this variable *will* be saved!)
If this achievement has a counter associated to it
(i.e. solve 20 problems) then this is where you store
the students counter for this achievement.
This variable will initally start as ''
If this achievement has a counter associated to it
(i.e. solve 20 problems) then this is where you store
the students counter for this achievement.
This variable will initially start as ''

- $maxCounter : the goal for the $counter variable for this achievement
(changes to this variable will not be saved!)
If this achievement has a counter associated to it then this variable
contains the goal for the counter. Your achievement should return 1
when $counter >= $maxCounter. These two variables are used to show a
progress bar for the achievement.
If this achievement has a counter associated to it then this variable
contains the goal for the counter. Your achievement should return 1
when $counter >= $maxCounter. These two variables are used to show a
progress bar for the achievement.

- $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject
DBchapter and DBsection Note: These values are not super stable and are likely to change
Expand All @@ -59,31 +59,31 @@
see the update. So when depending on other achievements place
make sure they are run first.

- $localData : this is a hash which stores data for this user and
- $localData : this is a hash which stores data for this user and
achievement (changes to this variable *will* be saved!)
This hash will persist from evaluation to evaluation. You can
store whatever you like in here and it can be accessed next time
this evaluator is run. Two things to keep in mind. First, The data
in this hash will *not* be accessible by other achievements. Second,
the first time a variable is accessed it will have the value ''.
This hash will persist from evaluation to evaluation. You can
store whatever you like in here and it can be accessed next time
this evaluator is run. Two things to keep in mind. First, The data
in this hash will *not* be accessible by other achievements. Second,
the first time a variable is accessed it will have the value ''.

- $globalData : this is a hash which stores data for all achievements
(changes to this variable *will* be saved!)
This hash will persist from evaluation to evaluation and, like
$localData, you can store whatever you like in here. This data
will be accessable from *every* achievement and is unique to the
$localData, you can store whatever you like in here. This data
will be accessible from *every* achievement and is unique to the
user. There are three variables stored in this hash that are
maintained by the system.
- $globalData->completeSets : This is the number of sets which
maintained by the system.
- $globalData->completeSets : This is the number of sets which
the student has earned 100% on
- $globalData->complete Problems : This is the number of problems
- $globalData->complete Problems : This is the number of problems
which the student has earned 100% on
- $globalData->prev_level_points : This is the number of points
to reach current level which is used with level progress bar.
Warning: The achievements are always evaluated in the order they
Warning: The achievements are always evaluated in the order they
are listed the Instructors achievement editor page. To make matters
more complicated, achievements which have already been earned are
not evaluated at all. The up-shot of this is that when modifying
variables in $globalData you need to either write your code so it
doesnt matter which order the evaluators are run, or you need to
pay very close attention to which evaluators are run and when.
more complicated, achievements which have already been earned are
not evaluated at all. The up-shot of this is that when modifying
variables in $globalData you need to either write your code so it
doesn't matter which order the evaluators are run, or you need to
pay very close attention to which evaluators are run and when.
2 changes: 1 addition & 1 deletion courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#DESCRIPTION
#KEYOWRDS('integrals', 'substitution')
#KEYWORDS('integrals', 'substitution')
# Integrals - \int_0^{$x1} x(x^2 ?{$a})^5 dx
# Substitution
#ENDDESCRIPTION
Expand Down
12 changes: 6 additions & 6 deletions courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ $PAR
$BBOLD 1. Simple numerical problem. $EBOLD A simple problem requiring a numerical answer. It illustrates how one can allow WeBWorK to calculate answers from formulas (e.g. an answer such as sqrt(3^2 +4^2) can be entered instead of the answer 5.). It also shows
an example of feedback on the correctness of each answer, rather than grading the entire problem.
$PAR
$BBOLD 2. Graphs and limits. $EBOLD The graph in this example is constructed on the fly. From the graph a student is supposed to determine the values and limits of the function at various points. The immediate feedback on this problem is particularly useful, since students often make unconcious mistakes.
$BBOLD 2. Graphs and limits. $EBOLD The graph in this example is constructed on the fly. From the graph a student is supposed to determine the values and limits of the function at various points. The immediate feedback on this problem is particularly useful, since students often make unconscious mistakes.
$PAR
$BBOLD 3. Derivatives. $EBOLD An example of checking answers which are formulas, rather than numbers.
$PAR
$BBOLD 4. Anti-derivatives. $EBOLD This example will accept any anti-derivative, adjusting for the fact that the answer is only defined up to a constant.
$PAR
$BBOLD 5. Answers with units. $EBOLD Try entering the answer to this question in meters (m) and also centimeters (cm).
$PAR
$BBOLD 6. A physics example. $EBOLD Includes a static picture.
$BBOLD 6. A physics example. $EBOLD Includes a static picture.
$PAR
$BBOLD 7. More graphics. $EBOLD An example of on-the-fly graphics. Select the graph of f, it's derivative and it's second derivatives.
$PAR
Expand Down Expand Up @@ -65,12 +65,12 @@ For most problems when entering numerical answers, you can if you wish
enter elementary expressions such as 2^3 instead of 8, sin(3*pi/2) instead
of -1, e^(ln(2)) instead of 2,
(2+tan(3))*(4-sin(5))^6-7/8 instead of 27620.3413, etc.
$PAR
Here's the
$PAR
Here's the
\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"list of the functions") \}
which WeBWorK understands.
which WeBWorK understands.

Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units")\} which WeBWorK understands. This can be useful in
Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units")\} which WeBWorK understands. This can be useful in
physics problems.
END_TEXT

Expand Down
4 changes: 2 additions & 2 deletions docker-config/idp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ the port as needed.
A docker service that implements a SAML2 identity provider is provided in the
`docker-compose.yml.dist` file. To start this identity provider along with the
rest of webwork2, add the `--profile saml2dev` argument to docker compose as in
the following exmaple.
the following example.

```bash
docker compose --profile saml2dev up
Expand Down Expand Up @@ -165,7 +165,7 @@ identity provider is accessible to webwork2.

The user was verified by the identity provider but did not have a corresponding
user account in the Webwork course. The Webwork user account needs to be created
separately as the Saml2 autentication module does not do user provisioning.
separately as the Saml2 authentication module does not do user provisioning.

### The WeBWorK service provider does not appear in the service provider Federation tab

Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/PGProblemEditor/pgproblemeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
if (webworkConfig?.pgCodeMirror) webworkConfig.pgCodeMirror.source = data.result_data.tidiedPGCode;
else document.getElementById('problemContents').value = data.result_data.tidiedPGCode;
saveTempFile();
showMessage('Successfuly perltidied code.', true);
showMessage('Successfully perltidied code.', true);
}
})
.catch((err) => showMessage(`Error: ${err?.message ?? err}`));
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/TagWidget/tagwidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

// Load the library taxonomy from the JSON file.
const response = await fetch(tagWidgetScript.dataset.taxonomy).catch(
(err) => `Could not load the OPL taxonomy from the server: ${err.messsage ?? err}`
(err) => `Could not load the OPL taxonomy from the server: ${err.message ?? err}`
);
if (typeof response === 'string') return showMessage(response);
if (!response.ok) return showMessage('Could not load the OPL taxonomy from the server.');
Expand Down
Loading